[Mapbender-commits] r5155 -
branches/2.6/resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Sat Dec 12 06:03:58 EST 2009
Author: astrid_emde
Date: 2009-12-12 06:03:58 -0500 (Sat, 12 Dec 2009)
New Revision: 5155
Modified:
branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql
Log:
we merged the sqls from trunk update_2.6_to_2.7rc1_pgsql_UTF-8.sql which are relevant for 2.6
Modified: branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql
===================================================================
--- branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql 2009-12-12 10:26:02 UTC (rev 5154)
+++ branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql 2009-12-12 11:03:58 UTC (rev 5155)
@@ -7,9 +7,13 @@
WHERE e_id = 'mapframe1';
--
--- wfs target mapframe1 and overview --## what if gui has no overview?
+-- wfs target mapframe1 and overview
--
-UPDATE gui_element SET e_js_file = 'wfs.php', e_target='mapframe1,overview' WHERE e_id = 'wfs';
+UPDATE gui_element SET e_js_file = 'wfs.php', e_target='mapframe1' WHERE e_id = 'wfs';
+UPDATE gui_element SET e_js_file = 'wfs.php', e_target='mapframe1,overview' WHERE e_id = 'wfs'
+AND fkey_gui_id IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'overview');
+
+
--
-- element wfs
--
@@ -68,7 +72,8 @@
SELECT gui_element.fkey_gui_id, 'body', 'popupcss', '../css/popup.css', 'file css', 'file/css'
FROM gui_element WHERE gui_element.e_id = 'body'
AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars
-WHERE var_name = 'popupcss' AND fkey_e_id = 'body');
+WHERE var_name = 'popupcss' AND fkey_e_id = 'body')
+AND fkey_gui_id NOT LIKE 'wms_%' AND fkey_gui_id NOT LIKE 'admin%' ;
--
@@ -78,7 +83,8 @@
SELECT gui_element.fkey_gui_id, 'body', 'tablesortercss', '../css/tablesorter.css', 'file css' ,'file/css'
FROM gui_element WHERE gui_element.e_id = 'body'
AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars
-WHERE var_name = 'tablesortercss' AND fkey_e_id = 'body');
+WHERE var_name = 'tablesortercss' AND fkey_e_id = 'body')
+AND fkey_gui_id NOT LIKE 'wms_%' AND fkey_gui_id NOT LIKE 'admin%' ;
--#style in gui_digitize
@@ -94,7 +100,6 @@
AND var_name = 'text css';
-
--
-- overview as div
--
@@ -127,7 +132,7 @@
--
-- treeGDE new element_var for treeGDE in body
--
--- css nun Teil vom Body
+-- css is now part of body and not treeGDE
UPDATE gui_element_vars set
fkey_e_id ='body',
var_name = 'treeGDE_css'
@@ -146,6 +151,7 @@
e_js_file = '../html/mod_treefolderPlain.php',
e_mb_mod = 'jsTree.js', e_requires = 'mapframe1' WHERE e_id = 'treeGDE';
+
--
-- remove treeGDE-css statement from 'treeGDE' because its handled in 'body' element
--
@@ -175,8 +181,17 @@
e_more_styles = 'overflow:hidden;',
e_content = '', e_closetag = 'div',
e_js_file = 'mod_zoomCoords.php',
+e_target = 'mapframe1',
+e_requires = 'mapframe1' WHERE e_id = 'zoomCoords';
+
+UPDATE gui_element SET e_element = 'div', e_src = '',
+e_attributes = '',
+e_more_styles = 'overflow:hidden;',
+e_content = '', e_closetag = 'div',
+e_js_file = 'mod_zoomCoords.php',
e_target = 'mapframe1,overview',
e_requires = 'mapframe1' WHERE e_id = 'zoomCoords';
+AND fkey_gui_id IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'overview');
--
@@ -188,7 +203,8 @@
'php_var' as var_type
FROM gui_element WHERE gui_element.e_id = 'body' AND
gui_element.fkey_gui_id NOT IN
-(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'use_load_message' AND fkey_e_id = 'body');
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'use_load_message' AND fkey_e_id = 'body')
+AND fkey_gui_id NOT LIKE 'wms_%' AND fkey_gui_id NOT LIKE 'admin%' ;
INSERT INTO gui_element_vars
SELECT gui_element.fkey_gui_id, 'body', 'includeWhileLoading',
@@ -197,7 +213,8 @@
'php_var' as var_type
FROM gui_element WHERE gui_element.e_id = 'body' AND
gui_element.fkey_gui_id NOT IN
-(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'includeWhileLoading' AND fkey_e_id = 'body');
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'includeWhileLoading' AND fkey_e_id = 'body')
+AND fkey_gui_id NOT LIKE 'wms_%' AND fkey_gui_id NOT LIKE 'admin%' ;
--
@@ -215,6 +232,7 @@
--
UPDATE gui_element SET e_mb_mod = 'geometry.js,requestGeometryConstructor.js,popup.js' WHERE e_id = 'setSpatialRequest';
+
-- element var cssfileAddWMS for gui element addWMSfromfilteredList_ajax
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
SELECT gui_element.fkey_gui_id, 'addWMSfromfilteredList_ajax', 'cssfileAddWMS', '../css/addwms.css', '' ,'file/css'
@@ -256,26 +274,75 @@
FROM gui_element WHERE gui_element.e_id = 'addWMSfromfilteredList_ajax' AND gui_element.fkey_gui_id NOT IN
(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'option_dbgui' AND fkey_e_id = 'addWMSfromfilteredList_ajax');
+
+--
+-- delete old element_vars for 'addWMSfromfilteredList_ajax' completely
+DELETE FROM gui_element_vars
+WHERE fkey_e_id = 'addWMSfromfilteredList_ajax'
+and var_name NOT IN ('cssfileAddWMS','capabilitiesInput','option_dbgui','option_dball','option_dbgroup');
+
+
--
-- featureinfoTunnel - element var featureInfoPopupHeight for gui element featureInfoTunnel
--
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) SELECT gui_element.fkey_gui_id, 'featureInfoTunnel', 'featureInfoPopupHeight', '200', '' ,'var' FROM gui_element WHERE gui_element.e_id = 'featureInfoTunnel' AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'featureInfoPopupHeight' AND fkey_e_id = 'featureInfoTunnel');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'featureInfoTunnel', 'featureInfoPopupHeight', '200', '' ,'var'
+FROM gui_element WHERE gui_element.e_id = 'featureInfoTunnel' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'featureInfoPopupHeight' AND fkey_e_id = 'featureInfoTunnel');
--
-- featureinfoTunnel - element var featureInfoPopupWidth for gui element featureInfoTunnel
--
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) SELECT gui_element.fkey_gui_id, 'featureInfoTunnel', 'featureInfoPopupWidth', '270', '' ,'var' FROM gui_element WHERE gui_element.e_id = 'featureInfoTunnel' AND gui_element.fkey_gui_id NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'featureInfoPopupWidth' AND fkey_e_id = 'featureInfoTunnel');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'featureInfoTunnel', 'featureInfoPopupWidth', '270', '' ,'var'
+FROM gui_element WHERE gui_element.e_id = 'featureInfoTunnel' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'featureInfoPopupWidth' AND fkey_e_id = 'featureInfoTunnel');
---
--- delete old element_vars for 'addWMSfromfilteredList_ajax' completely
-DELETE FROM gui_element_vars
-WHERE fkey_e_id = 'addWMSfromfilteredList_ajax'
-and var_name NOT IN ('cssfileAddWMS','capabilitiesInput','option_dbgui','option_dball','option_dbgroup');
+--
+-- featureinfoTunnel
+-- element var featureInfoLayerPopup for gui element featureInfoTunnel
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'featureInfoTunnel', 'featureInfoLayerPopup', 'false', '' ,'var'
+FROM gui_element WHERE gui_element.e_id = 'featureInfoTunnel' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'featureInfoLayerPopup' AND fkey_e_id = 'featureInfoTunnel');
+--
+-- element var tooltip_noResultArray for gui element tooltip
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'tooltip', 'tooltip_noResultArray', E'["Kein Ergebnis.","<body onload=\'javascript:window.close()\'>"]', '', 'var' FROM gui_element
+WHERE gui_element.e_id = 'tooltip' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'tooltip_noResultArray' AND fkey_e_id = 'tooltip');
+
+--
+-- element var tooltip_disableWfs for gui element tooltip
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'tooltip', 'tooltip_disableWfs', '0', 'disable WFS getFeature Request', 'var'
+FROM gui_element WHERE gui_element.e_id = 'tooltip' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'tooltip_disableWfs' AND fkey_e_id = 'tooltip');
+
+--
+-- element var tooltip_disableWms for gui element tooltip
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'tooltip', 'tooltip_disableWms', '1', 'disable WMS getFeatureInfo Request', 'var'
+FROM gui_element WHERE gui_element.e_id = 'tooltip' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'tooltip_disableWms' AND fkey_e_id = 'tooltip');
+
+
--
--- body add flavicon - element var favicon for gui element body
+-- body add favicon - element var favicon for gui element body
--
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
SELECT gui_element.fkey_gui_id, 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var' FROM gui_element
WHERE gui_element.e_id = 'body' AND gui_element.fkey_gui_id NOT IN
(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'favicon' AND fkey_e_id = 'body');
+
+
+-- element var switchwms for gui element treeGDE
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id, 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var'
+FROM gui_element WHERE gui_element.e_id = 'treeGDE' AND gui_element.fkey_gui_id NOT IN
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'switchwms' AND fkey_e_id = 'treeGDE');
More information about the Mapbender_commits
mailing list