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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-04-12 01:17:10 -0700 (Fri, 12 Apr 2019)
New Revision: 10103

Modified:
   trunk/mapbender/http/php/mod_callCswMetadata.php
Log:
Don't sent like filter via csw client, if wildcard * is given

Modified: trunk/mapbender/http/php/mod_callCswMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_callCswMetadata.php	2019-04-12 05:56:20 UTC (rev 10102)
+++ trunk/mapbender/http/php/mod_callCswMetadata.php	2019-04-12 08:17:10 UTC (rev 10103)
@@ -548,10 +548,14 @@
     }
 }
 //combine filter
-if ($existsSpatialFilter == true && $queryText !== ''){
+if ($existsSpatialFilter == true && $queryText !== '' && $queryText !== '*'){
     $additionalFilter = "<ogc:And>".$fullTextFilter.$spatialFilter."</ogc:And>";
 } else {
-    $additionalFilter = $fullTextFilter;
+    if ($queryText == '' || $queryText == '*') {
+        $additionalFilter = false;
+    } else {
+	$additionalFilter = $fullTextFilter;
+    }
 }