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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-03-20 03:57:25 -0700 (Wed, 20 Mar 2019)
New Revision: 10081

Modified:
   trunk/mapbender/http/php/wms.php
Log:
Fix for data-service coupling for metador dataset metadata - don't use stored datasetid_codespace attribute from mb_metadata

Modified: trunk/mapbender/http/php/wms.php
===================================================================
--- trunk/mapbender/http/php/wms.php	2019-03-20 07:56:32 UTC (rev 10080)
+++ trunk/mapbender/http/php/wms.php	2019-03-20 10:57:25 UTC (rev 10081)
@@ -1209,8 +1209,8 @@
 		$metadataArray['datasetid_codespace'] = $row_metadata["datasetid_codespace"];
 		$namespace = $admin->getIdentifierCodespaceFromRegistry($respOrga, $metadataArray);	
 		$namespaceArray[] = $namespace;
-		//check id datasetid is set, if not use metadataid
-		if ($row_metadata["datasetid"] == '' || !isset($row_metadata["datasetid"])) {
+		//check id datasetid and codespace and $namespace is not the datasetid_codespace from mb_metadata, if not use metadataid
+		if ((($row_metadata["datasetid"] == '' || !isset($row_metadata["datasetid"])) && $row_metadata["datasetid_codespace"] !== $namespace) || $row_metadata["origin"] == 'metador') {
 			$datasetId = $row_metadata["uuid"];
 		} else {
 			$datasetId = $row_metadata["datasetid"]; //really datasetid or only second part?