[Mapbender-commits] r1933 - branches/mapbender_sld/http/php

[svn_mapbender at osgeo.org]

Author: mschulz
Date: 2007-12-18 10:38:37 -0500 (Tue, 18 Dec 2007)
New Revision: 1933

Modified:
   branches/mapbender_sld/http/php/mod_editGuiWms.php
Log:
fixed: layer duplication because of multiple assigned slds 

Modified: branches/mapbender_sld/http/php/mod_editGuiWms.php
===================================================================
--- branches/mapbender_sld/http/php/mod_editGuiWms.php	2007-12-18 15:17:38 UTC (rev 1932)
+++ branches/mapbender_sld/http/php/mod_editGuiWms.php	2007-12-18 15:38:37 UTC (rev 1933)
@@ -422,9 +422,10 @@
    $cnt_wf++;
  }
 #gui_layer
-$sql_gl = "SELECT l.*, gl.*, sld.sld_user_layer_id, sld.use_sld FROM layer AS l, gui_layer AS gl left outer join sld_user_layer AS sld on sld.fkey_layer_id = gl.fkey_layer_id WHERE l.layer_id = gl.fkey_layer_id AND gl.gui_layer_wms_id = $1 AND gl.fkey_gui_id = $2 AND (sld.fkey_gui_id = $2 or sld.fkey_gui_id is NULL) ORDER BY l.layer_pos";
-$v = array($wmsList,$guiList);
-$t = array('i','s');
+$sql_gl = "SELECT l.*, gl.*, sld.sld_user_layer_id, sld.use_sld FROM layer AS l, gui_layer AS gl left outer join sld_user_layer AS sld on sld.fkey_layer_id = gl.fkey_layer_id WHERE l.layer_id = gl.fkey_layer_id AND gl.gui_layer_wms_id = $1 AND gl.fkey_gui_id = $2 AND (sld.fkey_gui_id = $2 or sld.fkey_gui_id is NULL) AND (sld.fkey_mb_user_id = $3 or sld.fkey_mb_user_id is NULL) ORDER BY l.layer_pos";
+$v = array($wmsList,$guiList,$mb_user_id);
+$t = array('i','s','i');
+
 $res_gl = db_prep_query($sql_gl,$v,$t);
 $gui_layer_status = array();
 $gui_layer_selectable = array();