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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-01-12 12:28:40 -0800 (Thu, 12 Jan 2017)
New Revision: 9654

Modified:
   trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php
   trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php
Log:
Show link to start search without categories

Modified: trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php	2017-01-12 19:51:15 UTC (rev 9653)
+++ trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php	2017-01-12 20:28:40 UTC (rev 9654)
@@ -163,6 +163,7 @@
 			pie2.destroy();
 		}
 		$.getJSON('mod_showCatalogueStatistics_server.php?registratingDepartments='+registratingDepartments+'&categoryType='+categoryType, null, function(data) { 
+			searchAll = "../../portal/nc/servicebereich/erweiterte-suche.html?cat=dienste&searchText=false&registratingDepartments="+currentDepartment;
 			if (data !== false) {
 				var pie2 = new d3pie("pie2", {
 					size: {
@@ -191,22 +192,22 @@
 							searchLink = "../../portal/nc/servicebereich/erweiterte-suche.html?cat=dienste&searchText=false&registratingDepartments="+currentDepartment+"&";
 							switch (categoryType) {
 								case "iso":
-									searchLink = searchLink+"isoCategories="+data.data.id;
+									searchLinkNew = searchLink+"isoCategories="+data.data.id;
 								break;
 								case "inspire":
-									searchLink = searchLink+"inspireThemes="+data.data.id;
+									searchLinkNew = searchLink+"inspireThemes="+data.data.id;
 								break;
 								default:
-									searchLink = searchLink+"isoCategories="+data.data.id;
+									searchLinkNew = searchLink;
 							}
-							window.top.location.href = searchLink;//alert(searchLink);//(data.data.id,'iso');
+							window.top.location.href = searchLink;//alert(searchLinkNew);//(data.data.id,'iso');
 							
 						}
 					}
 				});
 			} else {
 				//alert("Keine weitere Kategorisierung vorhanden!");
-				$("#dialog").append( "<p id=\"error\">Keine Kategorisierung von Datensätzen vorhanden!</p>" );
+				$("#dialog").append( "<p id=\"error\">Keine Kategorisierung von Datensätzen vorhanden!<br><a onclick='window.top.location.href = searchAll;'>Alle Datensätze anzeigen</a></p>" );
 				if (pie2 !== undefined) {
 					pie2.destroy();
 				}

Modified: trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php	2017-01-12 19:51:15 UTC (rev 9653)
+++ trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php	2017-01-12 20:28:40 UTC (rev 9654)
@@ -8,9 +8,9 @@
 $categoryType = "iso";
 if (isset($_REQUEST["adminLevel"]) & $_REQUEST["adminLevel"] != "") {
 	$testMatch = $_REQUEST["adminLevel"];	
- 	if (!($testMatch == 'LAU_1' or $testMatch == 'LAU_2' or $testMatch == 'NUTS_3' or $testMatch == 'NUTS_1' or $testMatch == 'NUTS_2')){ 
+ 	if (!($testMatch == 'LAU_1' or $testMatch == 'LAU_2' or $testMatch == 'NUTS_3' or $testMatch == 'NUTS_1' or $testMatch == 'NUTS_2' or $testMatch == 'other')){ 
 		//echo 'outputFormat: <b>'.$testMatch.'</b> is not valid.<br/>'; 
-		echo 'Parameter <b>adminLevel</b> is not valid (NUTS_1, NUTS_2, NUTS_3, LAU_1, LAU_2).<br/>'; 
+		echo 'Parameter <b>adminLevel</b> is not valid (NUTS_1, NUTS_2, NUTS_3, LAU_1, LAU_2, other).<br/>'; 
 		die(); 		
  	}
 	$adminLevel = $testMatch;
@@ -21,7 +21,7 @@
 	$testMatch = $_REQUEST["categoryType"];	
  	if (!($testMatch == 'iso' or $testMatch == 'inspire' or $testMatch == 'custom')){ 
 		//echo 'outputFormat: <b>'.$testMatch.'</b> is not valid.<br/>'; 
-		echo 'Parameter <b>adminLevel</b> is not valid (inspire, iso, custom).<br/>'; 
+		echo 'Parameter <b>categoryType</b> is not valid (inspire, iso, custom).<br/>'; 
 		die(); 		
  	}
 	$categoryType = $testMatch;