[Mapbender-commits] r7941 - branches/2.7/resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2011-07-14 07:05:04 -0700 (Thu, 14 Jul 2011)
New Revision: 7941

Modified:
   branches/2.7/resources/db/pgsql/UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql
Log:
update script overwrites the user defined EPSG options

Modified: branches/2.7/resources/db/pgsql/UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql
===================================================================
--- branches/2.7/resources/db/pgsql/UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql	2011-07-14 13:45:17 UTC (rev 7940)
+++ branches/2.7/resources/db/pgsql/UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql	2011-07-14 14:05:04 UTC (rev 7941)
@@ -123,13 +123,17 @@
 INSERT INTO gui_element_vars select fkey_gui_id,'overview' as fkey_e_id, 'overview_wms' as var_name, '0' as var_value, 'wms that shows up as overview' as context, 'var' as var_type from gui_element where e_id = 'overview';
 UPDATE gui_element SET e_pos = 2, e_element = 'div', e_more_styles = 'visibility:visible;overflow:scroll', e_content = '', e_closetag = 'div', e_js_file = '../html/mod_treefolderPlain.php', e_mb_mod = 'jsTree.js', e_requires = 'mapframe1' WHERE e_id = 'treeGDE';
 INSERT INTO gui_element_vars select fkey_gui_id,'body' as fkey_e_id, 'treeGDE_css' as var_name, '../css/treeGDE2.css' as var_value, 'cssfile for TreeGDE' as context, 'file/css' as var_type from gui_element where e_id = 'treeGDE';
-UPDATE gui_element SET e_element = 'select', e_src = '', e_attributes = '', e_content = '<option value="">undefined</option>
+UPDATE gui_element SET e_element = 'select', e_src = '', e_attributes = '', e_closetag = 'select', e_js_file = 'mod_changeEPSG.php' WHERE e_id = 'changeEPSG';
+
+-- only update e_content when e_content is empty
+UPDATE gui_element SET e_content = '<option value="">undefined</option>
 <option value="EPSG:4326">EPSG:4326</option>
 <option value="EPSG:31466">EPSG:31466</option>
 <option value="EPSG:31467">EPSG:31467</option>
 <option value="EPSG:31468">EPSG:31468</option>
-<option value="EPSG:31469">EPSG:31469</option>', e_closetag = 'select', e_js_file = 'mod_changeEPSG.php' WHERE e_id = 'changeEPSG';
+<option value="EPSG:31469">EPSG:31469</option>' WHERE e_id = 'changeEPSG' and e_content IS NULL or e_content = '';
 
+
 DELETE FROM gui_element WHERE e_id = 'closePolygon';
 DELETE FROM gui_element WHERE e_id = 'rubber';
 DELETE FROM gui_element WHERE e_id = 'getArea';