[Mapbender-commits] r9956 - in trunk/mapbender/http: classes php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-09-06 00:29:54 -0700 (Thu, 06 Sep 2018)
New Revision: 9956

Modified:
   trunk/mapbender/http/classes/class_owsConstraints.php
   trunk/mapbender/http/php/mod_dataISOMetadata.php
Log:
Fix for license information handling

Modified: trunk/mapbender/http/classes/class_owsConstraints.php
===================================================================
--- trunk/mapbender/http/classes/class_owsConstraints.php	2018-09-05 04:17:07 UTC (rev 9955)
+++ trunk/mapbender/http/classes/class_owsConstraints.php	2018-09-06 07:29:54 UTC (rev 9956)
@@ -387,7 +387,7 @@
 			$jsonLicense = new stdClass();
 			$jsonLicense->id = $license_id;
 			$jsonLicense->name = $license_name;
-			$jsonLicense->link = $license_link;
+			$jsonLicense->url = $license_link;
 			$predefinedLicenseText = _mb('License').": ".$license_id." - ".$license_name." - ".$license_link;
 			if ($license_source !== false) {
 				$jsonLicense->quelle = $license_source;

Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php	2018-09-05 04:17:07 UTC (rev 9955)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php	2018-09-06 07:29:54 UTC (rev 9956)
@@ -1140,7 +1140,7 @@
 		$jsonLicense = new stdClass();
 		$jsonLicense->id = $license_id;
 		$jsonLicense->name = $license_name;
-		$jsonLicense->link = $license_link;
+		$jsonLicense->url = $license_link;
 		$predefinedLicenseText = " "._mb('License').": ".$license_id." - ".$license_name." - ".$license_link;
 		if ($license_source !== false) {
 			$jsonLicense->quelle = $license_source;
@@ -1186,7 +1186,7 @@
 		$useConstraints=$iso19139->createElement("gmd:useConstraints");
 		$MD_RestrictionCode=$iso19139->createElement("gmd:MD_RestrictionCode");
 		$MD_RestrictionCode->setAttribute("codeList", "http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/gmxCodelists.xml#MD_RestrictionCode");
-		$MD_RestrictionCode->setAttribute("codeListValue", "otherConstraints");
+		$MD_RestrictionCode->setAttribute("codeListValue", "otherRestrictions");
 		$useConstraints->appendChild($MD_RestrictionCode);
 		$MD_LegalConstraints->appendChild($useConstraints);