Index: http/javascripts/mod_wfs_SpatialRequest.php =================================================================== --- http/javascripts/mod_wfs_SpatialRequest.php (revision 1725) +++ http/javascripts/mod_wfs_SpatialRequest.php (working copy) @@ -408,7 +408,7 @@ } filter += ''; filter += ''; - mb_get_geom(url, filter, i, w_[i]); + mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]); } } else if(queryGeom.geomType==geomType.line){ @@ -430,7 +430,7 @@ filter += rectangle[0].x+","+rectangle[0].y+ " " + rectangle[1].x+","+rectangle[1].y; filter += ""; url += param; - mb_get_geom(url, filter, i, w_[i]); + mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]); } } else if(queryGeom.geomType == geomType.point){ @@ -451,7 +451,7 @@ filter += (tmp.x + buffer) + "," + (tmp.y + buffer) + " " + (tmp.x - buffer) + "," + (tmp.y + buffer) + " " + (tmp.x - buffer) + "," + (tmp.y - buffer); filter += ""; url += param; - mb_get_geom(url, filter, i, w_[i]); + mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]); } } // highlight = new Highlight(mb_wfs_targets, highlight_tag_id, {"position":"absolute", "top":"0px", "left":"0px", "z-index":generalHighlightZIndex}, generalHighlightLineWidth); @@ -458,9 +458,9 @@ return true; } -function mb_get_geom(url, filter, index, wfs_conf_id) { +function mb_get_geom(url, filter, index, typename, js_wfs_conf_id, db_wfs_conf_id) { - mb_ajax_post("../" + wfsResultModulePath + wfsResultModuleFilename,{'url':url,'filter':filter,'typename':wfs_config[wfs_conf_id]['featuretype_name'],'wfs_conf_id':wfs_conf_id},function(js_code,status){ + mb_ajax_post("../" + wfsResultModulePath + wfsResultModuleFilename, {'url':url,'filter':filter,'typename':typename,'js_wfs_conf_id':js_wfs_conf_id, 'db_wfs_conf_id':db_wfs_conf_id}, function(js_code,status){ // alert(js_code); eval(js_code); if (typeof(geom) == 'object') mb_execWfsReadSubFunctions(geom); Index: http/php/mod_wfs_result.php =================================================================== --- http/php/mod_wfs_result.php (revision 1725) +++ http/php/mod_wfs_result.php (working copy) @@ -18,7 +18,11 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. $filter = stripslashes($_REQUEST["filter"]); -$url = stripslashes($_REQUEST['url']); +$url = stripslashes($_REQUEST["url"]); +$js_wfs_conf_id = $_REQUEST["js_wfs_conf_id"]; +$db_wfs_conf_id = $_REQUEST["db_wfs_conf_id"]; +$typename = $_REQUEST["typename"]; + //echo $filter; die(); require_once("../../conf/mapbender.conf"); require_once("../classes/class_stripRequest.php"); @@ -60,7 +64,6 @@ $el = -1; $fid = -1; -$typename = $_REQUEST["typename"]; $element_str = ""; $geom_str = ""; foreach ($values as $element) { @@ -106,7 +109,7 @@ } // TO DO: the following is added twice! Once suffices. $element_str .= "geom.get(" . $member . ").e.setElement('fid', '".$fid."');\n"; - $element_str .= "geom.get(" . $member . ").wfs_conf = ".$_REQUEST['wfs_conf_id'].";\n"; + $element_str .= "geom.get(" . $member . ").wfs_conf = ".$js_wfs_conf_id.";\n"; } else if(strtoupper($element[tag]) == strtoupper("gml:coordinates") && $geom == true){ $tmp = str_replace(",,","",str_replace(" ",",",trim($element[value])));