[Mapbender-commits] r4529 - branches/mifan_dev/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: mifan
Date: 2009-08-17 13:14:17 -0400 (Mon, 17 Aug 2009)
New Revision: 4529

Modified:
   branches/mifan_dev/mapbender/http/php/mod_searchCatQueryBuilder_server.php
Log:
last minute changes .... seems to have some encoding bug


Modified: branches/mifan_dev/mapbender/http/php/mod_searchCatQueryBuilder_server.php
===================================================================
--- branches/mifan_dev/mapbender/http/php/mod_searchCatQueryBuilder_server.php	2009-08-17 15:06:31 UTC (rev 4528)
+++ branches/mifan_dev/mapbender/http/php/mod_searchCatQueryBuilder_server.php	2009-08-17 17:14:17 UTC (rev 4529)
@@ -86,9 +86,11 @@
 	foreach($catalogIDs as $catalog_id=>$url){
 		//$cat_obj = new csw();
 		//$cat_obj->createCatObjFromDB($catalogs);
-		list($getrecordsurl,$getrecordsxml) = getrecords_get_build_query($url,$simplesearch);
+		//list($getrecordsurl,$getrecordsxml) = getrecords_get_build_query($url,$simplesearch);
+		list($getrecordsurl,$getrecordsxml) = getrecords_build_query($url,$getrecords_type,$command);
 		if($DEBUG_)
 		array_push($resultObj['cats'],array("id"=>$catalog_id,"title"=>$getrecordsurl));
+		//array_push($resultObj['cats'],array("title"=>$catalog_id.'url',"abstractt"=>$getrecordsurl));
 		//Create Record Objects
 		$RecordObj = new cswrecord();
 		$RecordObj->createCSWRecordFromXML($getrecordsurl,$getrecordsxml);
@@ -110,7 +112,7 @@
  * @param $getrecords_url
  * @return array URL and XML
  */
-function getrecords_build_query($getrecords_url){
+function getrecords_build_query($getrecords_url,$type,$command){
 	
 	//CHECK FOR COMMAND, GET POST. HANDLE THINGS HERE
 	
@@ -122,13 +124,21 @@
 	$resulttype = 'results';
 	$typename = 'csw:Record';
 	$service='CSW';
+	global $simplesearch;
 	
-	switch(mb_strtolower($getrecords_type)){
+	switch(strtolower($type)){
 		case 'get':
 			$url = $getrecords_url.'?request='.$request.'&service='.$service.'&ResultType='.$resulttype.'&TypeNames='.$typename.'&version='.$version;
 			if($command=='getrecordssimple'){
+				
 				//Simple GetRecords via GET
-				$url .= (isset($simplesearch) && $simplesearch!="")?'&constraintlanguage=CQLTEXT&constraint=csw:AnyText Like %'.$simplesearch.'%':'';
+				$tmpurl = "csw:AnyText Like '%$simplesearch%'";
+				$suburl = urlencode($tmpurl);
+				$aurl = "%$simplesearch%";
+				$aurl = urlencode($aurl);
+				$tmpurl = "csw:AnyText%20Like%20%27$aurl%27";
+				$url .= (isset($simplesearch) && $simplesearch!="")?'&constraintlanguage=CQLTEXT&constraint='.$tmpurl:'';
+				
 			}
 			else {
 				//Advanced GetRecords via GET
@@ -142,9 +152,10 @@
 		case 'soap':
 			break;
 		default:
+			break;
 	}
 	
-	return array('url'=>$url,'xml'=>$xml);
+	return array($url,$xml);
 }	
 
 function getrecords_advanced_get($url){