[Mapbender-commits] r8421 - trunk/mapbender/resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Jul 5 07:36:26 PDT 2012
Author: astrid_emde
Date: 2012-07-05 07:36:25 -0700 (Thu, 05 Jul 2012)
New Revision: 8421
Modified:
trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql
Log:
merged some sql from 2.7.3
Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql 2012-07-05 14:35:59 UTC (rev 8420)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql 2012-07-05 14:36:25 UTC (rev 8421)
@@ -1,7 +1,7 @@
-- new file for db changes to 2.7.3
-- replace gettext to handle ' in french translation
-DROP FUNCTION gettext(text, text);
+DROP FUNCTION IF EXISTS gettext(text, text);
CREATE OR REPLACE FUNCTION gettext(locale_arg text, string text)
RETURNS character varying AS
$BODY$
@@ -111,7 +111,7 @@
-- Function: f_count_layer_couplings(integer)
-DROP FUNCTION f_count_layer_couplings(integer);
+DROP FUNCTION IF EXISTS f_count_layer_couplings(integer);
CREATE OR REPLACE FUNCTION f_count_layer_couplings(integer)
RETURNS integer AS
$BODY$
@@ -203,8 +203,11 @@
gui_element.e_id = 'legend' AND
gui_element.fkey_gui_id
NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'legend' AND var_name = 'reverseLegend');
+
+--
+-- add WMS_preferences as dialog to gui1
+--
DELETE FROM gui_element WHERE e_id = 'WMS_preferences' AND fkey_gui_id = 'gui1';
-
INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, 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) VALUES('gui1','WMS_preferencesButton',2,1,'button for configure the preferences of each loaded wms','Manage WMS preferences','img','../img/button_blink_red/preferences_off.png','',670,60,24,24,1,'','','','../plugins/mb_button.js','','WMS_preferencesDiv','','http://www.mapbender.org/index.php/WMS_preferences');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'WMS_preferencesButton', 'dialogWidth', '400', '' ,'var');
@@ -212,17 +215,24 @@
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'WMS_preferencesDiv', 'overwrite', '0', '' ,'var');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'WMS_preferencesDiv', 'saveInSession', '0', '' ,'var');
+
+--
+-- new gazetteer jsonAutocompleteGazetteer
+--
INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, 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) VALUES('gui1','jq_ui_autocomplete',5,1,'Module to manage jQuery UI autocomplete module','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','../extensions/jquery-ui-1.8.16.custom/development-bundle/ui/jquery.ui.autocomplete.js','','jq_ui,jq_ui_widget,jq_ui_position','http://jqueryui.com/demos/autocomplete/');
-
-
INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, 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) VALUES('gui1','jsonAutocompleteGazetteer',12,1,'Client for json webservices like geonames.org','Gazetteer','div','','',220,110,NULL ,NULL ,999,'','','div','../plugins/mod_jsonAutocompleteGazetteer.php','','mapframe1','','http://www.mapbender.org/index.php/mod_jsonAutocompleteGazetteer');
-
-
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'jsonAutocompleteGazetteer', 'gazetteerUrl', 'http://ws.geonames.org/searchJSON?lang=de&',
'' ,'var');
-
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'jsonAutocompleteGazetteer', 'isGeonames', 'true', '' ,'var');
+
+--
+-- change datatype from 50 to 256 to handle longer style names
+--
+ALTER TABLE layer_style ALTER COLUMN name TYPE character varying(256);
+ALTER TABLE gui_layer ALTER COLUMN gui_layer_style TYPE character varying(256);
+ALTER TABLE keyword ALTER COLUMN keyword TYPE text;
+
--INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, 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) VALUES('toolbox_jquery','jq_ui_autocomplete',5,1,'Module to manage jQuery UI autocomplete module','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','../extensions/jquery-ui-1.8.16.custom/development-bundle/ui/jquery.ui.autocomplete.js','','jq_ui,jq_ui_widget,jq_ui_position','http://jqueryui.com/demos/autocomplete/');
-- Function: f_normalize_load_count(text,integer)
@@ -464,3 +474,28 @@
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'resultListWidth', '600', 'width of the result list dialog' ,'var');
UPDATE gui_element SET e_js_file = '../extensions/wz_jsgraphics.js,geometry.js,../extensions/RaphaelJS/raphael-1.4.7.min.js,../extensions/RaphaelJS/raphael-1.4.7.min.js,../extensions/RaphaelJS/raphael-1.4.7.min.js,../extensions/RaphaelJS/raphael-1.4.7.min.js' where fkey_gui_id = 'gui1' AND e_id = 'body';
+
+--
+-- replace server name wms1.ccgis.de to wms.wheregroup.com
+--
+Update wms set wms_getcapabilities = replace(wms_getcapabilities,'wms1.ccgis.de','wms.wheregroup.com');
+Update wms set wms_getmap = replace(wms_getmap,'wms1.ccgis.de','wms.wheregroup.com');
+Update wms set wms_getfeatureinfo = replace(wms_getfeatureinfo,'wms1.ccgis.de','wms.wheregroup.com');
+Update wms set wms_getlegendurl = replace(wms_getlegendurl,'wms1.ccgis.de','wms.wheregroup.com');
+
+Update layer_style set legendurl = replace(legendurl,'wms1.ccgis.de','wms.wheregroup.com');
+
+Update wfs set wfs_getcapabilities = replace(wfs_getcapabilities,'wms1.ccgis.de','wms.wheregroup.com');
+Update wfs set wfs_describefeaturetype = replace(wfs_describefeaturetype,'wms1.ccgis.de','wms.wheregroup.com');
+Update wfs set wfs_getfeature = replace(wfs_getfeature,'wms1.ccgis.de','wms.wheregroup.com');
+Update wfs set wfs_transaction = replace(wfs_transaction,'wms1.ccgis.de','wms.wheregroup.com');
+
+
+-- Fix: Ticket #870, http://trac.osgeo.org/mapbender/ticket/870
+UPDATE gui_element set e_attributes='frameborder="1" onmouseover="this.style.zIndex=300;this.style.width=''350px'';" onmouseout="this.style.zIndex=3;this.style.width=''200px'';"' where fkey_gui_id='gui' and e_id='legend';
+
+--
+-- legend: add new element vars enlargetreewidth and enlargetreewidthopacity to gui
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'enlargetreewidth', '300', 'false (default): no enlargement of the div, integer value to enlarge on mouseover' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'treeGDE', 'enlargetreewidthopacity', 'true', '' ,'var');
More information about the Mapbender_commits
mailing list