[Mapbender-commits] r1215 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-03-12 05:31:55 -0400 (Mon, 12 Mar 2007)
New Revision: 1215

Modified:
   trunk/mapbender/http/php/mod_editGuiWms.php
Log:
bugfix: ordered by layer_pos (was: by layer_id)

http://trac.osgeo.org/mapbender/ticket/11

Modified: trunk/mapbender/http/php/mod_editGuiWms.php
===================================================================
--- trunk/mapbender/http/php/mod_editGuiWms.php	2007-03-12 09:05:34 UTC (rev 1214)
+++ trunk/mapbender/http/php/mod_editGuiWms.php	2007-03-12 09:31:55 UTC (rev 1215)
@@ -403,41 +403,29 @@
    $cnt_wf++;
  }
 #gui_layer
-$sql_gl = "SELECT * FROM gui_layer WHERE  gui_layer_wms_id = $1 AND fkey_gui_id = $2 ORDER BY fkey_layer_id";
+$sql_gl = "SELECT * FROM layer AS l, gui_layer AS gl WHERE  l.layer_id = gl.fkey_layer_id AND gl.gui_layer_wms_id = $1 AND gl.fkey_gui_id = $2 ORDER BY l.layer_pos";
 $v = array($wmsList,$guiList);
 $t = array('i','s');
 $res_gl = db_prep_query($sql_gl,$v,$t);
-$cnt_gl = 0;
 while($row = db_fetch_array($res_gl)){
-   $fkey_layer_id[$cnt_gl] = $row["fkey_layer_id"];
-   $gui_layer_status[$cnt_gl] = $row["gui_layer_status"];
-   $gui_layer_selectable[$cnt_gl] = $row["gui_layer_selectable"];
-   $gui_layer_visible[$cnt_gl] = $row["gui_layer_visible"];
-   $gui_layer_queryable[$cnt_gl] = $row["gui_layer_queryable"];
-   $gui_layer_querylayer[$cnt_gl] = $row["gui_layer_querylayer"];
-   $gui_layer_minscale[$cnt_gl] = $row["gui_layer_minscale"];
-   $gui_layer_maxscale[$cnt_gl] = $row["gui_layer_maxscale"];
-   $gui_layer_priority[$cnt_gl] = $row["gui_layer_priority"];
-	$gui_layer_wfs_featuretype[$cnt_gl] = $row["gui_layer_wfs_featuretype"];
-   $cnt_gl++;
- }
-#layer
-$sql_l = "SELECT * FROM layer WHERE  fkey_wms_id = $1 ORDER BY layer_pos"; #layer_id"; #
-$v = array($wmsList);
-$t = array('i');
-$res_l = db_prep_query($sql_l,$v,$t);
-$cnt_l = 0;
-while($row = db_fetch_array($res_l)){
-   $layer_id[$cnt_l] = $row["layer_id"];
-   $layer_parent[$cnt_l] = $row["layer_parent"];
-   $layer_name[$cnt_l] = $row["layer_name"];
-   $layer_title[$cnt_l] = $row["layer_title"];
-   $layer_queryable[$cnt_l] = $row["layer_queryable"];
-   $layer_minscale[$cnt_l] = $row["layer_minscale"];
-   $layer_maxscale[$cnt_l] = $row["layer_maxscale"];
-   $cnt_l++;
- }
-if($cnt_gl != $cnt_l){echo "error: different layer count";}
+	array_push($gui_layer_status, $row["gui_layer_status"]);
+	array_push($gui_layer_selectable, $row["gui_layer_selectable"]);
+	array_push($gui_layer_visible, $row["gui_layer_visible"]);
+	array_push($gui_layer_queryable, $row["gui_layer_queryable"]);
+	array_push($gui_layer_querylayer, $row["gui_layer_querylayer"]);
+	array_push($gui_layer_minscale, $row["gui_layer_minscale"]);
+	array_push($gui_layer_maxscale, $row["gui_layer_maxscale"]);
+	array_push($gui_layer_priority, $row["gui_layer_priority"]);
+	array_push($gui_layer_wfs_featuretype, $row["gui_layer_wfs_featuretype"]);
+	array_push($layer_id, $row["layer_id"]);
+	array_push($layer_parent, $row["layer_parent"]);
+	array_push($layer_name, $row["layer_name"]);
+	array_push($layer_title, $row["layer_title"]);
+	array_push($layer_queryable, $row["layer_queryable"]);
+	array_push($layer_minscale, $row["layer_minscale"]);
+	array_push($layer_maxscale, $row["layer_maxscale"]);
+}
+
 #layer_epsg
 $sql_le = "SELECT * FROM layer_epsg WHERE  fkey_layer_id = $1";
 $v = array($layer_id[0]);