[Mapbender-commits] r7844 - trunk/mapbender/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jun 8 07:38:05 EDT 2011
Author: armin11
Date: 2011-06-08 04:38:04 -0700 (Wed, 08 Jun 2011)
New Revision: 7844
Modified:
trunk/mapbender/http/php/mod_dataISOMetadata.php
trunk/mapbender/http/php/mod_showMetadata.php
Log:
Extension to show coupled metadata and bugfix for metadata generation for inspire
Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php 2011-06-06 09:28:11 UTC (rev 7843)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php 2011-06-08 11:38:04 UTC (rev 7844)
@@ -601,6 +601,12 @@
$countCustom++;
}
$e = new mb_notice("count custom categories: ".$countCustom);
+ //close decriptive keywords and generate a new entry for inspire themes:
+ $descriptiveKeywords->appendChild($MD_Keywords);
+ $MD_DataIdentification->appendChild($descriptiveKeywords);
+ //new entry - with gemet thesaurus referenced
+ $descriptiveKeywords=$iso19139->createElement("gmd:descriptiveKeywords");
+ $MD_Keywords=$iso19139->createElement("gmd:MD_Keywords");
//read out the inspire categories and push them in as controlled keywords
/* example
<gmd:keyword><gco:CharacterString>Geographical names</gco:CharacterString></gmd:keyword><gmd:thesaurusName><gmd:CI_Citation><gmd:title><gco:CharacterString>GEMET - INSPIRE themes, version 1.0</gco:CharacterString></gmd:title><gmd:date><gmd:CI_Date><gmd:date><gco:Date>2008-06-01</gco:Date></gmd:date><gmd:dateType><gmd:CI_DateTypeCode codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode" codeListValue="publication">publication</gmd:CI_DateTypeCode></gmd:dateType></gmd:CI_Date></gmd:date></gmd:CI_Citation></gmd:thesaurusName></gmd:MD_Keywords></gmd:descriptiveKeywords><gmd:descriptiveKeywords><gmd:MD_Keywords><gmd:keyword><gco:CharacterString>BasisDLM</gco:CharacterString></gmd:keyword>
@@ -754,7 +760,10 @@
$language=$iso19139->createElement("gmd:language");
$LanguageCode=$iso19139->createElement("gmd:LanguageCode");
$LanguageCodeText=$iso19139->createTextNode('ger');
+ $LanguageCode->setAttribute("codeListValue", "ger");
+ $LanguageCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#LanguageCode");
$LanguageCode->appendChild($LanguageCodeText);
+
$language->appendChild($LanguageCode);
$MD_DataIdentification->appendChild($language);
Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php 2011-06-06 09:28:11 UTC (rev 7843)
+++ trunk/mapbender/http/php/mod_showMetadata.php 2011-06-08 11:38:04 UTC (rev 7844)
@@ -188,6 +188,12 @@
$translation['wmcQualityText'] = 'Für Web Map Context Dokumente entfällt die Angabe zur Qualität!';
$translation['noTouInformation'] = 'Es sind keine Informationen über Nutzungsbedingungen verfügbar!';
$translation['loadWmc'] = 'Link um Anwendung mit WMC zu starten';
+ $translation['validate'] = "Validierung";
+ $translation['uploaded metadata'] = "Hochgeladene Metadaten";
+ $translation['linked metadata'] = "Verlinkte Metadaten";
+ $translation['metadata from capabilities'] = "Metadaten von Service Capabilities";
+ $translation['added from registry'] = "Metadaten über Registry angereichert";
+ $translation['Coupled Metadata'] = "Verknüpfte Metadaten";
break;
case "en":
$translation['overview'] = 'Overview';
@@ -254,6 +260,12 @@
$translation['wmcQualityText'] = 'In case of Web Map Context Documents the Quality part is not applicable!';
$translation['noTouInformation'] = 'No informations about terms of use are available!';
$translation['loadWmc'] = 'Link to start application with WMC';
+ $translation['validate'] = "validate";
+ $translation['uploaded metadata'] = "uploaded metadata";
+ $translation['linked metadata'] = "linked metadata";
+ $translation['metadata from capabilities'] = "metadata from capabilities";
+ $translation['added from registry'] = "added from registry";
+ $translation['Coupled Metadata'] = "Coupled Metadata";
break;
default: #to english
$translation['overview'] = 'Overview';
@@ -320,6 +332,12 @@
$translation['wmcQualityText'] = 'In case of Web Map Context Documents the Quality part is not applicable!';
$translation['noTouInformation'] = 'No informations about terms of use are available!';
$translation['loadWmc'] = 'Link to start application with WMC';
+ $translation['validate'] = "validate";
+ $translation['uploaded metadata'] = "uploaded metadata";
+ $translation['linked metadata'] = "linked metadata";
+ $translation['metadata from capabilities'] = "metadata from capabilities";
+ $translation['added from registry'] = "added from registry";
+ $translation['Coupled Metadata'] = "Coupled Metadata";
}
//Array with infos about the different elements which are shown in the tabs
@@ -834,27 +852,75 @@
}
$html .= $tableEnd;
$html .= $tableBegin;
+
//Scales
if ((isset($resourceMetadata['contentminscale']) & $resourceMetadata['contentminscale'] != '0') or (isset($resourceMetadata['contentmaxscale']) & $resourceMetadata['contentmaxscale'] != '0')){
- $html .= '<h4>'.$translation['restrictedScale'].'</h4>';
- if (isset($resourceMetadata['contentminscale']) & $resourceMetadata['contentminscale'] != '0' ) {
+ $html .= $t_a.$translation['restrictedScale'].$t_b.$t_c;
+ if (isset($resourceMetadata['contentminscale']) & $resourceMetadata['contentminscale'] != '0' & $resourceMetadata['contentminscale'] != "") {
$html .= $t_a.$translation['maxscale'].$t_b. "1 : ".$resourceMetadata['contentminscale'].$t_c;
}
- if (isset($resourceMetadata['contentmaxscale']) & $resourceMetadata['contentmaxscale'] != '0') {
+ if (isset($resourceMetadata['contentmaxscale']) & $resourceMetadata['contentmaxscale'] != '0' & $resourceMetadata['contentmaxscale'] != "") {
$html .= $t_a.$translation['minscale'].$t_b. "1 : ".$resourceMetadata['contentmaxscale'].$t_c;
}
+ //$html .= '</fieldset>';
}
+$html .= $tableEnd;
if (isset($resourceMetadata['wfs_describefeaturetype']) && ($resourceMetadata['wfs_describefeaturetype'] != '')) {
$html .= $t_a.$translation['describeFeaturetype'].$t_b."<a href='".$resourceMetadata['wfs_describefeaturetype']."SERVICE=WFS&VERSION=".$resourceMetadata['serviceversion']."&REQUEST=DescribeFeaturetype&typename=".$resourceMetadata['contentname']."' >Link</a>".$t_c;
#$html .= $t_a.$translation['describeFeaturetype'].$t_b."<a href='".$resourceMetadata['wfs_describefeaturetype']."&REQUEST=DescribeFeaturetype&typename=".$resourceMetadata['contentname']."' >Link</a>".$t_c;
}
-
if (isset($resourceMetadata['featuretype_geomType']) && ($resourceMetadata['featuretype_geomType'] != '')) {
$html .= $t_a.$translation['geomtype'].$t_b.$resourceMetadata['featuretype_geomType'].$t_c;
}
+if ($resource == 'wms' or $resource == 'layer'){
+ $html .= $tableBegin;
+ //part for coupled resources - if they exists (first this is realized only for layers):
+ //get metadata entries
+ //get MetadataURLs from md_metadata table
+ $sql = <<<SQL
+ SELECT metadata_id, uuid, link, linktype, md_format, origin FROM mb_metadata
+ INNER JOIN (SELECT * from ows_relation_metadata
+ WHERE fkey_layer_id = $layerId ) as relation ON
+ mb_metadata.metadata_id = relation.fkey_metadata_id WHERE mb_metadata.origin
+ IN('capabilities','external','metador','upload')
+SQL;
+ $res = db_query($sql);
+
+ $i = 0;
+ $metadataList = "";
+ while ($row = db_fetch_assoc($res)) {
+ //$html .= "<li>";
+ switch ($row["origin"]) {
+ case "capabilities" :
+ $metadataList .= "<img src='../img/osgeo_graphics/geosilk/server_map.png' title='".$translation['metadata from capabilities']."'/>";
+ break;
+ case "external" :
+ $metadataList .= "<img src='../img/osgeo_graphics/geosilk/link.png' title='".$translation['linked metadata']."'/>";
+ break;
+ case "upload" :
+ $metadataList .= "<img src='../img/button_blue_red/up.png' title='".$translation['uploaded metadata']."'/>";
+ break;
+ case "metador" :
+ $metadataList .= "<img src='../img/gnome/edit-select-all.png' title='".$translation['added from registry']."'/>";
+ break;
+ default:
+ break;
+ }
+ $metadataList .= "<a href='../php/mod_dataISOMetadata.php?outputFormat=iso19139&id=".$row["uuid"]."'>".$row["uuid"]."</a> <a href='../php/mod_dataISOMetadata.php?outputFormat=iso19139&id=".$row["uuid"]."&validate=true'>".$translation['validate']."</a><br>";
+ $i++;
+ }
+ if ($i != 0) {
+ $html .= $t_a.$translation['Coupled Metadata'].$t_b;
+ $html .= $metadataList;
+ }
+
+ $html .= $t_c;
+ $html .= $tableEnd;
+}
+
$html .= $tableEnd;
$html .= '</p>';
$html .= '</div>';
More information about the Mapbender_commits
mailing list