[Mapbender-commits] r9747 - trunk/mapbender/http/geoportal

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-05-24 04:40:20 -0700 (Wed, 24 May 2017)
New Revision: 9747

Modified:
   trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php
   trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php
Log:
Fix for starting search with filter restrictToOpenData

Modified: trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php	2017-05-24 10:15:49 UTC (rev 9746)
+++ trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php	2017-05-24 11:40:20 UTC (rev 9747)
@@ -197,13 +197,17 @@
 								case "inspire":
 									searchLinkNew = searchLink+"inspireThemes="+data.data.id;
 								break;
-								case "opendata":							
-									searchLinkNew = searchLink+"restrictToOpenData=true";
+								case "opendata":
+ 									if (data.data.id == "1") {
+										searchLinkNew = searchLink+"restrictToOpenData=true";
+									} else {
+										searchLinkNew = searchLink;
+									}
 								break;
 								default:
 									searchLinkNew = searchLink;
 							}
-							window.top.location.href = searchLink;//alert(searchLinkNew);//(data.data.id,'iso');
+							window.top.location.href = searchLinkNew;//alert(searchLinkNew);//(data.data.id,'iso');
 							
 						}
 					}

Modified: trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php	2017-05-24 10:15:49 UTC (rev 9746)
+++ trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php	2017-05-24 11:40:20 UTC (rev 9747)
@@ -151,11 +151,11 @@
 			$resultObj[0]["label"] = "OpenData";
 			$resultObj[0]["value"] = $numberOfOpenResults;				
 			$resultObj[0]["caption"] = "OpenData";
-			$resultObj[0]["id"] = 0;
+			$resultObj[0]["id"] = 1;
 			$resultObj[1]["label"] = "Keine freie Lizenz!";
 			$resultObj[1]["value"] = $numberOfResults;				
 			$resultObj[1]["caption"] = "Keine freie Lizenz!";
-			$resultObj[1]["id"] = 1;
+			$resultObj[1]["id"] = 0;
 			$i = 2;
 		}
 	}