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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-05-06 22:56:51 -0700 (Sun, 06 May 2018)
New Revision: 9908

Modified:
   trunk/mapbender/http/classes/class_metadata_new.php
Log:
Fix for wfs search with category and opendata filter

Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php	2018-05-04 09:00:26 UTC (rev 9907)
+++ trunk/mapbender/http/classes/class_metadata_new.php	2018-05-07 05:56:51 UTC (rev 9908)
@@ -1313,12 +1313,12 @@
 		}	
 		//search filter for isopen - open data classification of the managed termsofuse
 		//
-		if ((strtolower($this->searchResources) === "wms" or strtolower($this->searchResources) === "wfs" or strtolower($this->searchResources) === "dataset") & $this->restrictToOpenData) {
+		if ($this->restrictToOpenData) {
 			array_push($whereCondArray, '(isopen = 1)');
 		}
 		//search filter for md_topic_categories
 		//
-		if ((strtolower($this->searchResources) === "wms" or strtolower($this->searchResources) === "wmc" or strtolower($this->searchResources) === "dataset") & $this->isoCategories != NULL) {
+		if ($this->isoCategories != NULL) {
 			$isoArray = explode(',',$this->isoCategories);
 			$topicCond = "(";
 			for($i=0; $i < count($isoArray); $i++){
@@ -1333,7 +1333,7 @@
 		}
 		//search filter for inspire_categories
 		//
-		if ((strtolower($this->searchResources) === "wms" or strtolower($this->searchResources) === "wmc" or strtolower($this->searchResources) === "dataset") & $this->inspireThemes != NULL) {
+		if ($this->inspireThemes != NULL) {
 			
 			$inspireArray = explode(',',$this->inspireThemes);
 			$inspireCond = "(";
@@ -1349,7 +1349,7 @@
 		}
 		//search filter for custom_categories
 		//
-		if ((strtolower($this->searchResources) === "wms" or strtolower($this->searchResources) === "wmc" or strtolower($this->searchResources) === "dataset") & $this->customCategories != NULL) {
+		if ($this->customCategories != NULL) {
 			
 			$customArray = explode(',',$this->customCategories);
 			$customCond = "(";