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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-04-07 06:52:44 -0700 (Thu, 07 Apr 2016)
New Revision: 9432

Modified:
   trunk/mapbender/http/php/mod_callMetadata.php
Log:
Enhancement for calling categories

Modified: trunk/mapbender/http/php/mod_callMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_callMetadata.php	2016-04-07 08:27:52 UTC (rev 9431)
+++ trunk/mapbender/http/php/mod_callMetadata.php	2016-04-07 13:52:44 UTC (rev 9432)
@@ -389,9 +389,9 @@
 if (isset($_REQUEST["resultTarget"]) & $_REQUEST["resultTarget"] != "") {
 	//validate to web,debug,file
 	$testMatch = $_REQUEST["resultTarget"];	
- 	if (!($testMatch == 'web' or $testMatch == 'debug' or $testMatch == 'file'  or $testMatch == 'webclient' or $testMatch == 'internal')){ 
+ 	if (!($testMatch == 'web' or $testMatch == 'debug' or $testMatch == 'file'  or $testMatch == 'webclient' or $testMatch == 'internal' or $testMatch == "categories")){ 
 		//echo 'resultTarget: <b>'.$testMatch.'</b> is not valid.<br/>';
-		echo 'Parameter <b>resultTarget</b> is not valid (file,web,debug,webclient,internal).<br/>'; 
+		echo 'Parameter <b>resultTarget</b> is not valid (file,web,debug,webclient,internal,categories).<br/>'; 
 		die(); 		
  	}
 	$resultTarget = $testMatch;
@@ -1035,7 +1035,7 @@
 		$metadata = new searchMetadata($userId, $searchId, $searchText, $registratingDepartments, $isoCategories, $inspireThemes, $timeBegin, $timeEnd, $regTimeBegin, $regTimeEnd, $maxResults, $searchBbox, $searchTypeBbox, $accessRestrictions, $languageCode, $searchEPSG, $searchResources[$i], $searchPages[$i], $outputFormat, $resultTarget, $searchURL, $customCategories, $hostName, $orderBy, $resourceIds, $restrictToOpenData, $originFromHeader, $resolveCoupledResources);
 	}
 }
-if ($resultTarget == 'web' or $resultTarget == 'debug' or $resultTarget == 'webclient') {
+if ($resultTarget == 'web' or $resultTarget == 'debug' or $resultTarget == 'webclient' or $resultTarget == 'categories') {
 	if (count($searchResources) == 1) {
 		//$e = new mb_exception("originFromHeader: ".$originFromHeader);
 		$metadata = new searchMetadata($userId, $searchId, $searchText, $registratingDepartments, $isoCategories, $inspireThemes, $timeBegin, $timeEnd, $regTimeBegin, $regTimeEnd, $maxResults, $searchBbox, $searchTypeBbox, $accessRestrictions, $languageCode, $searchEPSG, $searchResources[0], $searchPages[0], $outputFormat, $resultTarget, $searchURL, $customCategories, $hostName, $orderBy, $resourceIds, $restrictToOpenData, $originFromHeader, $resolveCoupledResources);