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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-05-02 06:33:51 -0400 (Wed, 02 May 2007)
New Revision: 1287

Modified:
   trunk/mapbender/http/classes/class_wmc.php
   trunk/mapbender/http/javascripts/mod_savewmc.php
Log:
querylayer


Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2007-04-30 09:18:08 UTC (rev 1286)
+++ trunk/mapbender/http/classes/class_wmc.php	2007-05-02 10:33:51 UTC (rev 1287)
@@ -439,6 +439,9 @@
 						 if($extension == true && strtoupper(sepNameSpace($element[tag])) == "WMS_ID"){
 					 		 $this->wmc_wms_id[$cnt_layer] = $element[value];
 						 }
+						 if($extension == true && strtoupper(sepNameSpace($element[tag])) == "QUERYLAYER"){
+					 		 $this->wmc_layer_querylayer[$cnt_layer] = $element[value];
+						 }
 						 if(strtoupper($element[tag]) == "METADATAURL" && $element[type] == "open"){
 							 $metadataurl = true;
 						 }
@@ -610,7 +613,7 @@
 								$this->wmc_wms_id[$ii] ."','1','1','". 
 								intval(!$this->wmc_layer_hidden[$ii]) ."','". 
 								$this->wmc_layer_queryable[$ii] ."','". 
-								$this->wmc_layer_queryable[$ii] ."','".
+								$this->wmc_layer_querylayer[$ii] ."','".
 								$this->wmc_layer_minscale[$ii]  ."','". 
 								$this->wmc_layer_maxscale[$ii]  ."');\n";
 	

Modified: trunk/mapbender/http/javascripts/mod_savewmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_savewmc.php	2007-04-30 09:18:08 UTC (rev 1286)
+++ trunk/mapbender/http/javascripts/mod_savewmc.php	2007-05-02 10:33:51 UTC (rev 1287)
@@ -281,6 +281,7 @@
 						layerHidden = 1;
 					}
 					layerQueryable = mb_mapObj[ind].wms[i].objLayer[j].layer_queryable;
+					layerQuerylayer = mb_mapObj[ind].wms[i].objLayer[j].gui_layer_querylayer;
 					layerId = mb_mapObj[ind].wms[i].objLayer[j].layer_uid;
 					layerName = htmlspecialchars(mb_mapObj[ind].wms[i].objLayer[j].layer_name,0);
 					layerTitle = htmlspecialchars(mb_mapObj[ind].wms[i].objLayer[j].layer_title, 0);
@@ -332,6 +333,7 @@
 					}
 					wmc += "\t\t\t\t<"+extension_namespace+":layer_id>"+layerId+"</"+extension_namespace+":layer_id>\n";
 					wmc += "\t\t\t\t<"+extension_namespace+":wms_id>"+wmsId+"</"+extension_namespace+":wms_id>\n";
+					wmc += "\t\t\t\t<"+extension_namespace+":querylayer>"+layerQuerylayer+"</"+extension_namespace+":querylayer>\n";
 					wmc += "\t\t\t</Extension>\n";
 
 					//layerFormat