[Mapbender-commits] r5051 - in trunk/mapbender: http/javascripts resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2009-11-30 06:10:02 -0500 (Mon, 30 Nov 2009)
New Revision: 5051

Modified:
   trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql
Log:
http://trac.osgeo.org/mapbender/ticket/498

Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2009-11-30 11:02:06 UTC (rev 5050)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2009-11-30 11:10:02 UTC (rev 5051)
@@ -70,6 +70,12 @@
 	openLinkFromSearch =0;
 }
 
+// Element var to initialize the start of the gazetteer on load of the application
+try {if(initializeOnLoad){}}catch(e) {initializeOnLoad = 0;}
+
+// Element var to allow search without any search params
+try {if(enableSearchWithoutParams){}}catch(e) {enableSearchWithoutParams = 0;}
+
 var targetArray = targetString.split(",");
 var global_wfsConfObj;
 var global_selectedWfsConfId;
@@ -590,6 +596,7 @@
 	if (parent.ie) {
 		selectNode.onchange = function() {
 		global_selectedWfsConfId = this.value;
+		initializeOnLoad = 0;
      	if(typeof(resultGeometryPopup)!="undefined"){
 	 		resultGeometryPopup.destroy();
 	 	}
@@ -601,7 +608,7 @@
 		};
 	}
 	else{
-	   selectNode.setAttribute("onchange", "if(typeof(resultGeometryPopup)!='undefined'){resultGeometryPopup.destroy();}if(typeof(wfsPopup)!='undefined'){wfsPopup.destroy();};global_selectedWfsConfId = this.value;appendStyles();appendWfsForm();");
+	   selectNode.setAttribute("onchange", "if(typeof(resultGeometryPopup)!='undefined'){resultGeometryPopup.destroy();}if(typeof(wfsPopup)!='undefined'){wfsPopup.destroy();};global_selectedWfsConfId = this.value;initializeOnLoad=0;appendStyles();appendWfsForm();");
 	}
 	var isSelected = false;
 	for (var wfsConfId in global_wfsConfObj) {
@@ -713,6 +720,10 @@
 	form.appendChild(delFilterButton);
 	
 	checkSrs();
+	
+	if(initializeOnLoad == 1) {
+		return validate();
+	}
 }
 
 function checkSrs(){
@@ -813,6 +824,10 @@
 		return false;
 	}
 	
+	if(enableSearchWithoutParams == 1) {
+    	cnt = 2;
+	}
+	
 //	if(spatialRequestGeom == null){
 //		alert("Bitte räumliche Eingrenzung vornehmen.");
 //		return false;
@@ -834,7 +849,8 @@
 
 	var filterParameterCount = getNumberOfFilterParameters();
 	
-	if(filterParameterCount == 0 && spatialRequestGeom == null){
+	if(filterParameterCount == 0 && spatialRequestGeom == null && initializeOnLoad != 1){
+	//if(filterParameterCount == 0 && spatialRequestGeom == null){
 	//if(filterParameterCount == 0){
 		//alert("Please specify at least one filter attribute.");
 		return false;
@@ -1151,6 +1167,7 @@
 						document.getElementById("res").innerHTML = '';
 						alert("No results.");
 					}
+					initializeOnLoad = 0;
 		       	}
 			});
 		}

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql	2009-11-30 11:02:06 UTC (rev 5050)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql	2009-11-30 11:10:02 UTC (rev 5051)
@@ -648,3 +648,9 @@
 -- add georss in gui1
 INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('gui1','addGeoRSS',2,1,'add a GeoRSS Feed to a running application','','img','../img/georss_logo_off.png','onclick=''loadGeoRSSByForm()''  onmouseover=''this.src = this.src.replace(/_off/,"_over");''  onmouseout=''this.src = this.src.replace(/_over/, "_off");'' title="GeoRSSFeed hinzuladen"',950,60,24,24,1,'','','','mod_georss.php','popupballon.js,usemap.js,geometry.js,../extensions/wz_jsgraphics.js','mapframe1','','');
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'addGeoRSS', 'loadGeorssFromSession', '1', '' ,'php_var');
+
+-- element var initializeOnLoad for gazetteerWFS
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) SELECT gui_element.fkey_gui_id, 'gazetteerWFS', 'initializeOnLoad', '0', 'start gazetteer onload' ,'var' FROM gui_element WHERE gui_element.e_id = 'gazetteerWFS' AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'initializeOnLoad' AND fkey_e_id = 'gazetteerWFS');
+
+-- element var enableSearchWithoutParams for gazetteerWFS
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) SELECT gui_element.fkey_gui_id, 'gazetteerWFS', 'enableSearchWithoutParams', '0', 'define that search can be started without any search params' ,'var' FROM gui_element WHERE gui_element.e_id = 'gazetteerWFS' AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'enableSearchWithoutParams' AND fkey_e_id = 'gazetteerWFS');