[Mapbender-commits] r9423 - trunk/mapbender/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Mar 11 02:59:19 PST 2016
Author: armin11
Date: 2016-03-11 02:59:19 -0800 (Fri, 11 Mar 2016)
New Revision: 9423
Modified:
trunk/mapbender/http/php/mod_dataISOMetadata.php
trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php
trunk/mapbender/http/php/mod_layerISOMetadata.php
Log:
Bugfixes for gdi-de testsuite - thanx to karl owesny
Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php 2016-03-10 14:15:35 UTC (rev 9422)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php 2016-03-11 10:59:19 UTC (rev 9423)
@@ -1275,7 +1275,7 @@
$characterSet=$iso19139->createElement("gmd:characterSet");
$MD_CharacterSetCode=$iso19139->createElement("gmd:MD_CharacterSetCode");
$MD_CharacterSetCode->setAttribute("codeListValue", $mb_metadata['inspire_charset']);
- $MD_CharacterSetCode->setAttribute("codeList", "http://www.isotc211.org/2005/resources/codeList.xml#MD_CharacterSetCode");
+ $MD_CharacterSetCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#MD_ScopeCode");
$characterSet->appendChild($MD_CharacterSetCode);
$MD_DataIdentification->appendChild($characterSet);
Modified: trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php 2016-03-10 14:15:35 UTC (rev 9422)
+++ trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php 2016-03-11 10:59:19 UTC (rev 9423)
@@ -554,7 +554,7 @@
//generate language part B 10.3 (if available) of the inspire metadata regulation
$language = $iso19139->createElement("gmd:language");
$languagecode = $iso19139->createElement("gmd:LanguageCode");
- $languagecode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#LanguageCode");
+ $languagecode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#LanguageCode");
if (isset($mapbenderMetadata['metadata_language'])) {
$languageText = $iso19139->createTextNode($mapbenderMetadata['metadata_language']);
$languagecode->setAttribute("codeListValue", $mapbenderMetadata['metadata_language']);
@@ -570,8 +570,7 @@
//generate characterset part - first it should be utf8 ;-)
$characterSet = $iso19139->createElement("gmd:characterSet");
$characterSetCode = $iso19139->createElement("gmd:MD_CharacterSetCode");
- $characterSetCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmx
-Codelists.xml#MD_CharacterSetCode");
+ $characterSetCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#MD_CharacterSetCode");
$characterSetCode->setAttribute("codeListValue", "utf8");
$characterSet->appendChild($characterSetCode);
$characterSet = $MD_Metadata->appendChild($characterSet);
@@ -579,7 +578,7 @@
//generate MD_Scope part B 1.3 (if available)
$hierarchyLevel = $iso19139->createElement("gmd:hierarchyLevel");
$scopecode = $iso19139->createElement("gmd:MD_ScopeCode");
- $scopecode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#MD_ScopeCode");
+ $scopecode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#MD_ScopeCode");
$scopecode->setAttribute("codeListValue", "service");
$scopeText = $iso19139->createTextNode("service");
@@ -631,7 +630,7 @@
}
$role=$iso19139->createElement("gmd:role");
$CI_RoleCode=$iso19139->createElement("gmd:CI_RoleCode");
- $CI_RoleCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_RoleCode");
+ $CI_RoleCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_RoleCode");
$CI_RoleCode->setAttribute("codeListValue", "pointOfContact");
$CI_RoleCodeText=$iso19139->createTextNode("pointOfContact");
@@ -709,7 +708,7 @@
$gcoDate=$iso19139->createElement("gco:Date");
$dateType=$iso19139->createElement("gmd:dateType");
$dateTypeCode=$iso19139->createElement("gmd:CI_DateTypeCode");
- $dateTypeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
+ $dateTypeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
$dateTypeCode->setAttribute("codeListValue", "publication");
$dateTypeCodeText=$iso19139->createTextNode('publication');
$dateText= $iso19139->createTextNode(date('Y-m-d',$mapbenderMetadata['serviceTimestampCreate']));
@@ -730,7 +729,7 @@
$gcoDate=$iso19139->createElement("gco:Date");
$dateType=$iso19139->createElement("gmd:dateType");
$dateTypeCode=$iso19139->createElement("gmd:CI_DateTypeCode");
- $dateTypeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
+ $dateTypeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
$dateTypeCode->setAttribute("codeListValue", "revision");
$dateTypeCodeText=$iso19139->createTextNode('revision');
$dateText= $iso19139->createTextNode(date('Y-m-d',$mapbenderMetadata['serviceTimestamp']));
@@ -751,7 +750,7 @@
$gcoDate=$iso19139->createElement("gco:Date");
$dateType=$iso19139->createElement("gmd:dateType");
$dateTypeCode=$iso19139->createElement("gmd:CI_DateTypeCode");
- $dateTypeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
+ $dateTypeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
$dateTypeCode->setAttribute("codeListValue", "creation");
$dateTypeCodeText=$iso19139->createTextNode('creation');
$dateText= $iso19139->createTextNode(date('Y-m-d',$mapbenderMetadata['serviceTimestampCreate']));
@@ -808,7 +807,7 @@
$email_cs=$iso19139->createElement("gco:CharacterString");
$role=$iso19139->createElement("gmd:role");
$CI_RoleCode=$iso19139->createElement("gmd:CI_RoleCode");
- $CI_RoleCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_RoleCode");
+ $CI_RoleCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_RoleCode");
$CI_RoleCode->setAttribute("codeListValue", "publisher");
if (isset($mapbenderMetadata['serviceDepartment']) && $mapbenderMetadata['serviceDepartment'] != NULL) {
$resOrgaText = $iso19139->createTextNode($mapbenderMetadata['serviceDepartment']);
@@ -971,7 +970,7 @@
$MD_LegalConstraints=$iso19139->createElement("gmd:MD_LegalConstraints");
$accessConstraints=$iso19139->createElement("gmd:accessConstraints");
$MD_RestrictionCode=$iso19139->createElement("gmd:MD_RestrictionCode");
- $MD_RestrictionCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#MD_RetrictionCode");
+ $MD_RestrictionCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#MD_RetrictionCode");
$MD_RestrictionCode->setAttribute("codeListValue", "otherRestrictions");
$MD_RestrictionCodeText=$iso19139->createTextNode("otherRestrictions");
$otherConstraints=$iso19139->createElement("gmd:otherConstraints");
@@ -1279,7 +1278,7 @@
$gmd_level=$iso19139->createElement("gmd:level");
$MD_ScopeCode=$iso19139->createElement("gmd:MD_ScopeCode");
$MD_ScopeCodeText=$iso19139->createTextNode("service");
- $MD_ScopeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#MD_ScopeCode");
+ $MD_ScopeCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#MD_ScopeCode");
$MD_ScopeCode->setAttribute("codeListValue", "service");
$MD_ScopeCode->appendChild($MD_ScopeCodeText);
$gmd_level->appendChild($MD_ScopeCode);
@@ -1306,7 +1305,7 @@
$gmd_dateType=$iso19139->createElement("gmd:dateType");
$CI_DateTypeCode=$iso19139->createElement("gmd:CI_DateTypeCode");
- $CI_DateTypeCode->setAttribute("codeList","http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
+ $CI_DateTypeCode->setAttribute("codeList","http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_DateTypeCode");
$CI_DateTypeCode->setAttribute("codeListValue","publication");
$CI_DateTypeCodeText=$iso19139->createTextNode("publication");
Modified: trunk/mapbender/http/php/mod_layerISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerISOMetadata.php 2016-03-10 14:15:35 UTC (rev 9422)
+++ trunk/mapbender/http/php/mod_layerISOMetadata.php 2016-03-11 10:59:19 UTC (rev 9423)
@@ -198,8 +198,7 @@
//generate characterset part - first it should be utf8 ;-)
$characterSet = $iso19139->createElement("gmd:characterSet");
$characterSetCode = $iso19139->createElement("gmd:MD_CharacterSetCode");
- $characterSetCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/ML_gmx
-Codelists.xml#MD_CharacterSetCode");
+ $characterSetCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#MD_CharacterSetCode");
$characterSetCode->setAttribute("codeListValue", "utf8");
$characterSet->appendChild($characterSetCode);
$characterSet = $MD_Metadata->appendChild($characterSet);
More information about the Mapbender_commits
mailing list