svn commit: r940 - trunk/mapbender/http/classes/class_gui.php
christoph at osgeo.org
christoph at osgeo.org
Wed Nov 22 04:08:50 EST 2006
Author: christoph
Date: 2006-11-22 09:08:50+0000
New Revision: 940
Modified:
trunk/mapbender/http/classes/class_gui.php
Log:
changed INSERT statements to
INSERT INTO <table> (col1, col2, ..) SELECT (col1, col2, ..) FROM <table> WHERE ...
Modified: trunk/mapbender/http/classes/class_gui.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/classes/class_gui.php?view=diff&rev=940&p1=trunk/mapbender/http/classes/class_gui.php&p2=trunk/mapbender/http/classes/class_gui.php&r1=939&r2=940
==============================================================================
--- trunk/mapbender/http/classes/class_gui.php (original)
+++ trunk/mapbender/http/classes/class_gui.php 2006-11-22 09:08:50+0000
@@ -177,35 +177,35 @@
$error = true;
}
- $sql = "INSERT INTO gui SELECT '" . $newGuiName . "', '" . $newGuiName . "',gui_description, gui_public FROM gui WHERE gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui (gui_id, gui_name, gui_description, gui_public) SELECT '" . $newGuiName . "', '" . $newGuiName . "',gui_description, gui_public FROM gui WHERE gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
$error = true;
}
- $sql = "INSERT INTO gui_element SELECT '" . $newGuiName . "', e_id, e_pos, e_public, e_comment, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url FROM gui_element WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) SELECT '" . $newGuiName . "', e_id, e_pos, e_public, e_comment, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url FROM gui_element WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
$error = true;
}
- $sql = "INSERT INTO gui_element_vars SELECT '" . $newGuiName . "', fkey_e_id, var_name, var_value, context, var_type FROM gui_element_vars WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_element_vars (fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) SELECT '" . $newGuiName . "', fkey_e_id, var_name, var_value, context, var_type FROM gui_element_vars WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
$error = true;
}
- $sql = "INSERT INTO gui_layer SELECT '" . $newGuiName . "', fkey_layer_id, gui_layer_wms_id, gui_layer_status, gui_layer_selectable, gui_layer_visible, gui_layer_queryable, gui_layer_querylayer, gui_layer_minscale, gui_layer_maxscale, gui_layer_priority, gui_layer_style, gui_layer_wfs_featuretype FROM gui_layer WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_layer (fkey_gui_id, fkey_layer_id, gui_layer_wms_id, gui_layer_status, gui_layer_selectable, gui_layer_visible, gui_layer_queryable, gui_layer_querylayer, gui_layer_minscale, gui_layer_maxscale, gui_layer_priority, gui_layer_style, gui_layer_wfs_featuretype) SELECT '" . $newGuiName . "', fkey_layer_id, gui_layer_wms_id, gui_layer_status, gui_layer_selectable, gui_layer_visible, gui_layer_queryable, gui_layer_querylayer, gui_layer_minscale, gui_layer_maxscale, gui_layer_priority, gui_layer_style, gui_layer_wfs_featuretype FROM gui_layer WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
$error = true;
}
- $sql = "INSERT INTO gui_mb_group SELECT '" . $newGuiName . "', fkey_mb_group_id, mb_group_type FROM gui_mb_group WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id, mb_group_type) SELECT '" . $newGuiName . "', fkey_mb_group_id, mb_group_type FROM gui_mb_group WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
@@ -214,7 +214,7 @@
if ($withUsers == true) {
/* users of original gui are copied as well */
- $sql = "INSERT INTO gui_mb_user SELECT '" . $newGuiName . "', fkey_mb_user_id, mb_user_type FROM gui_mb_user WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) SELECT '" . $newGuiName . "', fkey_mb_user_id, mb_user_type FROM gui_mb_user WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
@@ -223,7 +223,7 @@
}
else {
// users of original gui are not copied, the current user is set as owner
- $sql = "INSERT INTO gui_mb_user VALUES ($1, $2, 'owner')";
+ $sql = "INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) VALUES ($1, $2, 'owner')";
$v = array($newGuiName, $_SESSION["mb_user_id"]);
$t = array('s', 'i');
$res = db_prep_query($sql,$v,$t);
@@ -232,21 +232,21 @@
$error = true;
}
}
- $sql = "INSERT INTO gui_treegde SELECT '" . $newGuiName . "', fkey_layer_id, id, lft, rgt, my_layer_title, layer, wms_id FROM gui_treegde WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_treegde (fkey_gui_id, fkey_layer_id, id, lft, rgt, my_layer_title, layer, wms_id) SELECT '" . $newGuiName . "', fkey_layer_id, id, lft, rgt, my_layer_title, layer, wms_id FROM gui_treegde WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
$error = true;
}
- $sql = "INSERT INTO gui_wfs SELECT '" . $newGuiName . "', fkey_wfs_id FROM gui_wfs WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_wfs (fkey_gui_id, fkey_wfs_id) SELECT '" . $newGuiName . "', fkey_wfs_id FROM gui_wfs WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
$error = true;
}
- $sql = "INSERT INTO gui_wms SELECT '" . $newGuiName . "', fkey_wms_id, gui_wms_position, gui_wms_mapformat, gui_wms_featureinfoformat, gui_wms_exceptionformat, gui_wms_epsg, gui_wms_visible FROM gui_wms WHERE fkey_gui_id = '" . $guiList . "';";
+ $sql = "INSERT INTO gui_wms (fkey_gui_id, fkey_wms_id, gui_wms_position, gui_wms_mapformat, gui_wms_featureinfoformat, gui_wms_exceptionformat, gui_wms_epsg, gui_wms_visible) SELECT '" . $newGuiName . "', fkey_wms_id, gui_wms_position, gui_wms_mapformat, gui_wms_featureinfoformat, gui_wms_exceptionformat, gui_wms_epsg, gui_wms_visible FROM gui_wms WHERE fkey_gui_id = '" . $guiList . "';";
$res = db_query($sql);
if (!$res) {
$report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
More information about the Mapbender_commits
mailing list