[Mapbender-commits] r6699 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-08-05 14:20:46 +0000 (Thu, 05 Aug 2010)
New Revision: 6699

Modified:
   trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
Log:
workaround for search values containing commas

Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2010-08-05 12:40:36 UTC (rev 6698)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2010-08-05 14:20:46 UTC (rev 6699)
@@ -1007,9 +1007,11 @@
 
 			for (var i = 0; i < el.length; i++) {
 				if (el[i]['f_search'] == 1){
+					var a = new Array();
 					if(el[i]['f_form_element_html'].match(/\<select/)){
 						var elementValue = document.getElementById(el[i]['element_name']).options[document.getElementById(el[i]['element_name']).selectedIndex].value;
-	    			}
+						a.push(elementValue);
+					}
 	    			else if(el[i]['f_form_element_html'].match(/checkbox/)){
 						var elementArray = document.getElementsByName(el[i]['element_name']);
 						var selectedVal = [];
@@ -1018,16 +1020,16 @@
 								selectedVal.push(elementArray[j].value);
 							}
 						}
-						var elementValue = selectedVal.join(",");
+						var elementValue = selectedVal;
+						a = elementValue;
 					}
 					else{
 						var elementValue = document.getElementById(el[i]['element_name']).value;
+						a = elementValue.split(",");
 					}
 				}
 				
 				if (el[i]['f_search'] == 1 && elementValue != '') {
-					var a = new Array();
-					a = elementValue.split(",");
 					var orConditions = "";
 					for (var j=0; j < a.length; j++) {
 						if(el[i]['f_operator']=='bothside'){
@@ -1262,7 +1264,7 @@
 			}
 	
 			var filter = "<ogc:Filter>"+andConditionString+"</ogc:Filter>";
-	
+	console.log(filter);
 			document.getElementById("res").innerHTML = "<table><tr><td><img src='"+progressIndicatorImg+"'></td><td>"+progressIndicatorText+"</td></tr></table>";
 			var parameters = {
 				"command" : "getSearchResults", 
@@ -1272,6 +1274,7 @@
 				"filter" : filter, 
 				"backlink" : ""
 			};
+			return false;
 			parent.mb_ajax_get("../php/mod_wfs_gazetteer_server.php", parameters, function (jsCode, status) {
 				document.getElementById("res").innerHTML = "<table><tr><td>"+arrangeResultsText+"</td></tr></table>";
 				if(status=='success'){