[Mapbender-commits] r9625 - in trunk/mapbender: conf http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-11-09 05:11:27 -0800 (Wed, 09 Nov 2016)
New Revision: 9625

Modified:
   trunk/mapbender/conf/isoMetadata.conf
   trunk/mapbender/http/classes/class_iso19139.php
Log:
Small fix for inheritance of source notes from service to dataset metadata and more robust reading of uselimitations field for showing html version of inspire iso metadata.

Modified: trunk/mapbender/conf/isoMetadata.conf
===================================================================
--- trunk/mapbender/conf/isoMetadata.conf	2016-11-08 13:46:46 UTC (rev 9624)
+++ trunk/mapbender/conf/isoMetadata.conf	2016-11-09 13:11:27 UTC (rev 9625)
@@ -293,7 +293,7 @@
 //B 8. Constraints related to access and use
 //B 8.1. Conditions applying to access and use (23)
 array(	ibus => "t01_object.obj_id",
-	iso19139 => "/gmd:MD_Metadata/gmd:identificationInfo/*/gmd:resourceConstraints/gmd:MD_Constraints/gmd:useLimitation/gco:CharacterString",
+	iso19139 => "/gmd:MD_Metadata/gmd:identificationInfo/*/gmd:resourceConstraints/*/gmd:useLimitation/gco:CharacterString",
 	iso19139explode => "false" ,
 	inspire => "conditions applying to access and use",
 	inspiremandatory => "true",

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2016-11-08 13:46:46 UTC (rev 9624)
+++ trunk/mapbender/http/classes/class_iso19139.php	2016-11-09 13:11:27 UTC (rev 9625)
@@ -1463,7 +1463,7 @@
 				$sqlUpdateSourceNote = "UPDATE mb_metadata SET md_license_source_note = $1 WHERE metadata_id = $2";
 				$t = array('s', 'i');
 				$v = array($service_source_note, $metadataId);
-				$res = db_prep_query($sqlUpdateSourceNote);
+				$res = db_prep_query($sqlUpdateSourceNote,$v,$t);
 				//$e = new mb_exception("Metadata with id ".$metadataId." inherits licence information from ".$resourceType." with resourceId ".$resourceId);
 			}
 			catch (Exception $e) {