[Mapbender-commits] r4814 - branches/2.6/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-10-20 08:00:47 -0400 (Tue, 20 Oct 2009)
New Revision: 4814

Modified:
   branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php
Log:


Modified: branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php	2009-10-20 11:59:57 UTC (rev 4813)
+++ branches/2.6/http/javascripts/mod_wfs_SpatialRequest.php	2009-10-20 12:00:47 UTC (rev 4814)
@@ -118,7 +118,7 @@
 }
 else {
 	if (buttonWfs_toDigitize_on == 1) {
-		mb_registerWfsReadSubFunctions(function(geom){
+		mb_registerWfsReadSubFunctions(function(geom, wfsConfId){
 			if (buttonWfs_toDigitize_target && window.frames[buttonWfs_toDigitize_target]) {
 				try {
 					tab_open(buttonWfs_toDigitize_target);
@@ -328,7 +328,7 @@
 		mod_wfs_spatialRequest_win = window.open("","mod_wfs_spatialRequest_win","width=200,height=150,resizable=yes");
 		mod_wfs_spatialRequest_win.document.open("text/html");
 
-		mod_wfs_spatialRequest_win.document.writeln('<script language="JavaScript" type="text/javascript">');
+		mod_wfs_spatialRequest_win.document.writeln('<script type="text/javascript" type="text/javascript">');
 		mod_wfs_spatialRequest_win.document.writeln('function set(obj){');
 		mod_wfs_spatialRequest_win.document.writeln('for(var i=0; i< document.getElementsByName("geom").length; i++){');
 		mod_wfs_spatialRequest_win.document.writeln('if(document.getElementsByName("geom")[i].checked){');
@@ -587,12 +587,12 @@
 					geom.get(i).wfs_conf = parseInt(js_wfs_conf_id);
 				}
 			}
-			checkIfAllAjaxCallsFinished(geom);
+			checkIfAllAjaxCallsFinished(geom, db_wfs_conf_id);
 		}
 	);
 }
 
-function checkIfAllAjaxCallsFinished (geom) {
+function checkIfAllAjaxCallsFinished (geom, wfsConfId) {
 	numberOfFinishedAjaxCalls++;
 	if (typeof(geom) == 'object'){
 		var mapIndex = getMapObjIndexByName(mod_wfs_spatialRequest_target);
@@ -609,7 +609,7 @@
 	}
 	if (numberOfFinishedAjaxCalls == numberOfAjaxCalls) {
 		numberOfFinishedAjaxCalls = 0;
-		mb_execWfsReadSubFunctions(geomArray);
+		mb_execWfsReadSubFunctions(geomArray, wfsConfId);
 	}
 }
 
@@ -807,4 +807,4 @@
 		wfsPopup = new mb_popup(detailPopupTitle,resultHtml,detailPopupWidth,detailPopupHeight,detailPopupX,detailPopupY);
 	}
 	wfsPopup.show();
-}
\ No newline at end of file
+}