[Mapbender-commits] r6943 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-24 14:04:23 +0000 (Fri, 24 Sep 2010)
New Revision: 6943

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
debugging

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2010-09-24 12:19:26 UTC (rev 6942)
+++ trunk/mapbender/http/classes/class_wms.php	2010-09-24 14:04:23 UTC (rev 6943)
@@ -2380,8 +2380,8 @@
 		}
 		
 		#layer
-		$sql = "Select * from gui_layer where gui_layer_wms_id = $1 AND fkey_gui_id = $2 ";
-		$sql .= " AND gui_layer_status = 1 ORDER BY gui_layer_priority;";
+		$sql = "Select * from gui_layer JOIN layer ON gui_layer.fkey_layer_id = layer.layer_id where gui_layer_wms_id = $1 AND fkey_gui_id = $2 ";
+		$sql .= " AND gui_layer_status = 1 ORDER BY gui_layer_priority, CAST(layer_pos AS numeric);";
 		$v = array($wms_id,$gui_id);
 		$t = array('i','s');
 		$res = db_prep_query($sql,$v,$t);
@@ -2408,6 +2408,8 @@
 				$this->objLayer[$layer_cnt]->layer_queryable =$row2["layer_queryable"];
 				$this->objLayer[$layer_cnt]->layer_minscale =$row2["layer_minscale"];
 				$this->objLayer[$layer_cnt]->layer_maxscale = $row2["layer_maxscale"];
+				global $firephp;
+				$firephp->log($this->objLayer[$layer_cnt]->layer_pos);
 				$count_layer++;
 			}
 			$this->objLayer[$layer_cnt]->layer_uid = $layer_id;
@@ -2556,7 +2558,7 @@
 		}
 
 			
-		$sql = "Select * from layer where fkey_wms_id = $1";
+		$sql = "Select * from layer where fkey_wms_id = $1 ORDER BY layer_pos";
 		$v = array($wms_id);
 		$t = array('i');
 		$res_layer = db_prep_query($sql,$v,$t);