[Mapbender-commits] r10164 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-06-27 02:32:34 -0700 (Thu, 27 Jun 2019)
New Revision: 10164

Modified:
   trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php
Log:
Fix for operateson attribute uuidref field for inspire atom feeds

Modified: trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php	2019-06-26 14:54:39 UTC (rev 10163)
+++ trunk/mapbender/http/php/mod_inspireAtomFeedISOMetadata.php	2019-06-27 09:32:34 UTC (rev 10164)
@@ -191,6 +191,7 @@
 		$mapbenderMetadata['mdAbstract'] = $mbMetadata['abstract'];
 		$mapbenderMetadata['mdRefSystem'] = $mbMetadata['ref_sytem'];
 		$mapbenderMetadata['datasetId'] = $mbMetadata['datasetid'];
+		$mapbenderMetadata['datasetIdCodeSpace'] = $mbMetadata['datasetid_codespace'];
 		$mapbenderMetadata['mdOrigin'] = $mbMetadata['origin'];
 		//read information for layer/layer_epsg/wms/layer classification - 'inspireidentifiziert'?
 		$sql = <<<SQL
@@ -259,6 +260,7 @@
 		$mapbenderMetadata['mdAbstract'] = $mbMetadata['abstract'];
 		$mapbenderMetadata['mdRefSystem'] = $mbMetadata['ref_sytem'];
 		$mapbenderMetadata['datasetId'] = $mbMetadata['datasetid'];
+		$mapbenderMetadata['datasetIdCodeSpace'] = $mbMetadata['datasetid_codespace'];
 		$mapbenderMetadata['mdOrigin'] = $mbMetadata['origin'];
 		$mapbenderMetadata['serviceUuid'] = $mbMetadata['uuid'];
 		$mapbenderMetadata['metadataId'] = $mbMetadata['metadata_id'];
@@ -338,6 +340,7 @@
 		$mapbenderMetadata['mdAbstract'] = $mbMetadata['abstract'];
 		$mapbenderMetadata['mdRefSystem'] = $mbMetadata['ref_sytem'];
 		$mapbenderMetadata['datasetId'] = $mbMetadata['datasetid'];
+		$mapbenderMetadata['datasetIdCodeSpace'] = $mbMetadata['datasetid_codespace'];
 		$mapbenderMetadata['mdOrigin'] = $mbMetadata['origin'];
 
 		//read information for layer/layer_epsg/wms/layer classification - 'inspireidentifiziert'?
@@ -418,6 +421,7 @@
 		$mapbenderMetadata['mdAbstract'] = $mbMetadata['abstract'];
 		$mapbenderMetadata['mdRefSystem'] = $mbMetadata['ref_sytem'];
 		$mapbenderMetadata['datasetId'] = $mbMetadata['datasetid'];
+		$mapbenderMetadata['datasetIdCodeSpace'] = $mbMetadata['datasetid_codespace'];
 		$mapbenderMetadata['mdOrigin'] = $mbMetadata['origin'];
 		//Problem multiple featuretypes maybe included to serve a dataset!!!
 		//We have to compute a general bbox, and?
@@ -629,7 +633,7 @@
 	$CI_ResponsibleParty=$iso19139->createElement("gmd:CI_ResponsibleParty");
 	$organisationName=$iso19139->createElement("gmd:organisationName");
 	$organisationName_cs=$iso19139->createElement("gco:CharacterString");
-	$e = new mb_exception("Atom: mb_group_name: ".$departmentMetadata['mb_group_name']." - serviceOnwerId: ".$mapbenderMetadata['serviceOwnerId']);
+	//$e = new mb_exception("Atom: mb_group_name: ".$departmentMetadata['mb_group_name']." - serviceOnwerId: ".$mapbenderMetadata['serviceOwnerId']);
 	if (isset($departmentMetadata['mb_group_name'])) {
 		$organisationNameText = $iso19139->createTextNode($departmentMetadata['mb_group_name']);
 	}
@@ -1197,6 +1201,11 @@
 		//$mapbenderMetadata['mdRefSystem'] = $mbMetadata['ref_sytem'];
 		//$mapbenderMetadata['datasetId'] = $mbMetadata['datasetid'];
 		//$mapbenderMetadata['mdOrigin'] = $mbMetadata['origin'];
+	//$uniqueResourceIdentifierCodespace = $admin->getIdentifierCodespaceFromRegistry($departmentMetadata, $mbMetadata);
+	//FIX:
+	$mbMetadata['datasetid'] = $mapbenderMetadata['datasetId'];
+	$mbMetadata['datasetid_codespace'] = $mapbenderMetadata['datasetIdCodeSpace'];
+	
 	$uniqueResourceIdentifierCodespace = $admin->getIdentifierCodespaceFromRegistry($departmentMetadata, $mbMetadata);
 
 	switch ($mapbenderMetadata['mdOrigin']) {