[Mapbender-commits] r5187 - in trunk/mapbender/http: classes javascripts php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2009-12-14 11:35:03 -0500 (Mon, 14 Dec 2009)
New Revision: 5187

Modified:
   trunk/mapbender/http/classes/class_csw.php
   trunk/mapbender/http/classes/class_cswrecord.php
   trunk/mapbender/http/javascripts/mod_searchCSW_ajax.php
   trunk/mapbender/http/php/mod_searchCatQueryBuilder_server.php
Log:
fix allow loading some more csw - catalogues to db

Modified: trunk/mapbender/http/classes/class_csw.php
===================================================================
--- trunk/mapbender/http/classes/class_csw.php	2009-12-12 14:44:07 UTC (rev 5186)
+++ trunk/mapbender/http/classes/class_csw.php	2009-12-14 16:35:03 UTC (rev 5187)
@@ -209,7 +209,7 @@
 			}
 			
 			//Store array of keywords
-	  		if(mb_strtolower($element[tag]) == "OWS:KEYWORD" OR mb_strtolower($element[tag]) == "KEYWORD"){
+	  		if(mb_strtolower($element[tag]) == "ows:keyword" OR mb_strtolower($element[tag]) == "keyword"){
 				$this->keywords[count($this->keywords)] = $element[value];
 			}
 			
@@ -386,6 +386,9 @@
 						//If not dflt, then it is either soap or xml - store this info as post_xml etc
 						$op_type_value .= '_'.$op_sub_type;
 					}
+					if(!isset($value)){
+						$value='';
+					}
 					//Store values
 					$sql = " INSERT INTO cat_op_conf(fk_cat_id, param_type, param_name, param_value) " ;
 	    			$sql .= " VALUES ($1, $2, $3, $4)";

Modified: trunk/mapbender/http/classes/class_cswrecord.php
===================================================================
--- trunk/mapbender/http/classes/class_cswrecord.php	2009-12-12 14:44:07 UTC (rev 5186)
+++ trunk/mapbender/http/classes/class_cswrecord.php	2009-12-14 16:35:03 UTC (rev 5187)
@@ -67,6 +67,7 @@
 		}
 		else{
 			$x = new connector($url);
+			$e = new mb_exception("class_cswrecord.php: requested url: ".$url);
 			$data = $x->file;
 		}
         

Modified: trunk/mapbender/http/javascripts/mod_searchCSW_ajax.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_searchCSW_ajax.php	2009-12-12 14:44:07 UTC (rev 5186)
+++ trunk/mapbender/http/javascripts/mod_searchCSW_ajax.php	2009-12-14 16:35:03 UTC (rev 5187)
@@ -74,7 +74,7 @@
 
 	//defaults
 	var getrecords_media = 'GET';
-	var getrecords_query = 'CQL';
+	var getrecords_query = 'CQL'; //FILTER
 	
 	//set server side URL for query builder
 	var phpUrl  = '../php/mod_searchCatQueryBuilder_server.php?<?php echo $urlParameters;?>';

Modified: trunk/mapbender/http/php/mod_searchCatQueryBuilder_server.php
===================================================================
--- trunk/mapbender/http/php/mod_searchCatQueryBuilder_server.php	2009-12-12 14:44:07 UTC (rev 5186)
+++ trunk/mapbender/http/php/mod_searchCatQueryBuilder_server.php	2009-12-14 16:35:03 UTC (rev 5187)
@@ -24,7 +24,7 @@
 require_once(dirname(__FILE__)."/../classes/class_administration.php"); 
 require_once(dirname(__FILE__)."/../classes/class_json.php");
 require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-require_once(dirname(__FILE__)."/../classes/class_connector.php");
+//require_once(dirname(__FILE__)."/../classes/class_connector.php");
 
 /*
  * get catalogs for gui
@@ -175,6 +175,7 @@
 	$query .= (isset($adv_subject) && $adv_subject!="")?"AND dc:Subject Like %$adv_subject%":'';
 	
 	$url = $url.urlencode($query);
+	$e = new mb_exception("mod_searchCatQueryBuilder.php: url: ".$url);
 	return $url;
 }