[Mapbender-commits] r10160 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-06-26 06:32:31 -0700 (Wed, 26 Jun 2019)
New Revision: 10160

Modified:
   trunk/mapbender/http/classes/class_cswClient.php
Log:
Fix for spatial search (bbox filter) via csw - set gml namespace!

Modified: trunk/mapbender/http/classes/class_cswClient.php
===================================================================
--- trunk/mapbender/http/classes/class_cswClient.php	2019-06-26 13:25:30 UTC (rev 10159)
+++ trunk/mapbender/http/classes/class_cswClient.php	2019-06-26 13:32:31 UTC (rev 10160)
@@ -134,7 +134,7 @@
 			case "getrecordsresolvecoupling":
 				$postRequest = '<?xml version="1.0" encoding="UTF-8"?>';
 				//TODO check the following: - resultType="hits" seems to be default behaviour
-				$postRequest .= '<csw:GetRecords service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" ';	
+				$postRequest .= '<csw:GetRecords service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0"  xmlns:gml="http://www.opengis.net/gml" ';	
 				$postRequest .= 'outputSchema="http://www.isotc211.org/2005/gmd" ';				
 				$postRequest .= 'resultType="results">';
     				$postRequest .= '<csw:Query typeNames="csw:Record">';
@@ -179,7 +179,7 @@
 				break;
 			case "transactionupdate":
 				$postRequest = '<?xml version="1.0" encoding="UTF-8"?>';
-				$postRequest .= '<csw:Transaction service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0">';
+				$postRequest .= '<csw:Transaction service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml">';
     				$postRequest .= '<csw:Update>';
 				
 				$postRequest .= $metadataRecordString;
@@ -188,7 +188,7 @@
 				break;
 			case "transactioninsert":
 				$postRequest = '<?xml version="1.0" encoding="UTF-8"?>';
-				$postRequest .= '<csw:Transaction service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0">';
+				$postRequest .= '<csw:Transaction service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml">';
     				$postRequest .= '<csw:Insert>';
 				$postRequest .= $metadataRecordString;
 				$postRequest .= ' </csw:Insert>';
@@ -196,7 +196,7 @@
 				break;
 			case "transactiondelete":
 				$postRequest = '<?xml version="1.0" encoding="UTF-8"?>';
-				$postRequest .= '<csw:Transaction service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0">';
+				$postRequest .= '<csw:Transaction service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml">';
     				$postRequest .= '<csw:Delete>';
             			$postRequest .= '<csw:Constraint version="1.0.0">';
                 		$postRequest .= '<ogc:Filter>';
@@ -213,7 +213,7 @@
 			case "counthits":
 				$postRequest = '<?xml version="1.0" encoding="UTF-8"?>';
 				//TODO check the following: - resultType="hits" seems to be default behaviour
-				$postRequest .= '<csw:GetRecords service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" ';					
+				$postRequest .= '<csw:GetRecords service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml" ';					
 				$postRequest .= 'resultType="hits">';
     				$postRequest .= '<csw:Query typeNames="csw:Record">';
 				$postRequest .= '<csw:ElementSetName>full</csw:ElementSetName>'; //full to get all queryables?
@@ -263,7 +263,7 @@
 			case "getrecordspaging":
 				if ($recordtype !== false && $maxrecords !== false && $startposition !== false) {				
 					$postRequest = '<?xml version="1.0" encoding="UTF-8"?>';
-					$postRequest .= '<csw:GetRecords service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" ';
+					$postRequest .= '<csw:GetRecords service="CSW" version="2.0.2" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" xmlns:apiso="http://www.opengis.net/cat/csw/apiso/1.0" xmlns:gml="http://www.opengis.net/gml" ';
 					$postRequest .= 'maxRecords="'.$maxrecords.'" ';
 					$postRequest .= 'startPosition="'.$startposition.'" ';
 					$postRequest .= 'outputSchema="http://www.isotc211.org/2005/gmd" ';