[Mapbender-commits] r8434 - trunk/mapbender/resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Jul 6 03:45:45 PDT 2012
Author: astrid_emde
Date: 2012-07-06 03:45:44 -0700 (Fri, 06 Jul 2012)
New Revision: 8434
Modified:
trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql
Log:
merged with 2.7
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-06 10:38:32 UTC (rev 8433)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql 2012-07-06 10:45:44 UTC (rev 8434)
@@ -220,7 +220,7 @@
-- 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(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','','',250,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');
@@ -233,8 +233,59 @@
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/');
+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_slider',5,1,'slider from the jQuery UI framework','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','../extensions/jquery-ui-1.8.16.custom/development-bundle/ui/minified/jquery.ui.slider.min.js','','jq_ui,jq_ui_mouse,jq_ui_widget','');
+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','resultList_Highlight',2,1,'highlighting functionality for resultList','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_Highlight.js','','resultList,mapframe1,overview','','http://www.mapbender.org/resultList_Highlight');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'maxHighlightedPoints', '500', 'max number of points to highlight' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'resultHighlightColor', '#ff0000', 'color of the highlighting' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'resultHighlightLineWidth', '2', 'width of the highlighting line' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'resultHighlightZIndex', '100', 'zindex of the highlighting' ,'var');
+
+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','resultList_Zoom',2,1,'zoom functionality for resultList','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_Zoom.js','','resultList,mapframe1','','http://www.mapbender.org/resultList_Zoom');
+
+
+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','resultList',2,1,'','Result List','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','div','mod_ResultList.js','../../lib/resultGeometryListController.js, ../../lib/resultGeometryListModel.js','mapframe1','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'position', '[600,50]', 'position of the result list dialog' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'resultListHeight', '400', 'height of the result list dialog' ,'var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'resultListTitle', 'Search results', 'title of the result list dialog' ,'var');
+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');
+
+UPDATE gui_element set e_width = 220 where fkey_gui_id = 'gui_digitize' and e_id = 'treeGDE';
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', '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_digitize', 'treeGDE', 'enlargetreewidthopacity', 'true', '' ,'var');
+
+INSERT INTO wfs_featuretype_namespace VALUES (1,4,'topp','http://www.openplans.org/topp');
+
+--
+-- merged SQl from trunk
+--
-- Function: f_normalize_load_count(text,integer)
--DROP FUNCTION f_normalize_load_count(text,integer);
@@ -258,7 +309,6 @@
$BODY$
LANGUAGE plpgsql VOLATILE
COST 100;
-ALTER FUNCTION f_normalize_load_count(text , integer) OWNER TO postgres;
UPDATE translations SET msgstr = 'Kartenprojektion ändern' WHERE msgstr = 'Karenprojektion ändern';
@@ -299,12 +349,9 @@
CONSTRAINT scheduler_fkey_wms_id_fkey FOREIGN KEY (fkey_wms_id)
REFERENCES wms (wms_id) MATCH SIMPLE
ON UPDATE CASCADE ON DELETE CASCADE
-)
-WITH (
- OIDS=FALSE
);
-ALTER TABLE scheduler OWNER TO postgres;
+
-- Table: ows_relation_data
-- DROP TABLE ows_relation_data;
@@ -319,13 +366,8 @@
CONSTRAINT ows_relation_data_fkey_data_id_fkey FOREIGN KEY (fkey_datalink_id)
REFERENCES datalink (datalink_id) MATCH SIMPLE
ON UPDATE CASCADE ON DELETE CASCADE
-)
-WITH (
- OIDS=FALSE
);
-ALTER TABLE ows_relation_data OWNER TO postgres;
-
-- Column: datalink_format
-- ALTER TABLE datalink DROP COLUMN datalink_format;
@@ -364,8 +406,7 @@
-- DROP FUNCTION f_count_featuretype_couplings(integer);
-CREATE OR REPLACE FUNCTION f_count_featuretype_couplings(integer)
- RETURNS integer AS
+CREATE OR REPLACE FUNCTION f_count_featuretype_couplings(integer) RETURNS integer AS
$BODY$
DECLARE
featuretype_rel int4;
@@ -377,11 +418,9 @@
$BODY$
LANGUAGE plpgsql VOLATILE
COST 100;
-ALTER FUNCTION f_count_featuretype_couplings(integer) OWNER TO postgres;
-- Function: f_collect_inspire_cat_wfs_featuretype(integer)
-
-- DROP FUNCTION f_collect_inspire_cat_wfs_featuretype(integer);
CREATE OR REPLACE FUNCTION f_collect_inspire_cat_wfs_featuretype(integer)
@@ -404,7 +443,6 @@
$BODY$
LANGUAGE plpgsql VOLATILE STRICT
COST 100;
-ALTER FUNCTION f_collect_inspire_cat_wfs_featuretype(integer) OWNER TO postgres;
ALTER TABLE ows_relation_metadata ADD COLUMN internal INTEGER;
@@ -421,14 +459,9 @@
CONSTRAINT wfs_featuretype_epsg_ibfk_1 FOREIGN KEY (fkey_featuretype_id)
REFERENCES wfs_featuretype (featuretype_id) MATCH SIMPLE
ON UPDATE CASCADE ON DELETE CASCADE
-)
-WITH (
- OIDS=FALSE
);
-ALTER TABLE wfs_featuretype_epsg OWNER TO postgres;
-- Column: featuretype_latlon_bbox
-
-- ALTER TABLE wfs_featuretype DROP COLUMN featuretype_latlon_bbox;
ALTER TABLE wfs_featuretype ADD COLUMN featuretype_latlon_bbox character varying;
@@ -456,50 +489,4 @@
--allow to decide if update of wms metadata will be published via twitter/rss
UPDATE gui_element set e_content = '<span style=''float:right''><input type=''checkbox'' id=''twitter_news''>Publish via Twitter<input type=''checkbox'' id=''rss_news''>Publish via RSS</input><input disabled="disabled" type=''button'' value=''Preview metadata''><input disabled="disabled" type=''submit'' value=''Save metadata''></span>' WHERE fkey_gui_id = 'admin_wms_metadata' and e_id = 'mb_md_submit';
-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_slider',5,1,'slider from the jQuery UI framework','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','../extensions/jquery-ui-1.8.16.custom/development-bundle/ui/minified/jquery.ui.slider.min.js','','jq_ui,jq_ui_mouse,jq_ui_widget','');
-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','resultList_Highlight',2,1,'highlighting functionality for resultList','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_Highlight.js','','resultList,mapframe1,overview','','http://www.mapbender.org/resultList_Highlight');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'maxHighlightedPoints', '500', 'max number of points to highlight' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'resultHighlightColor', '#ff0000', 'color of the highlighting' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'resultHighlightLineWidth', '2', 'width of the highlighting line' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList_Highlight', 'resultHighlightZIndex', '100', 'zindex of the highlighting' ,'var');
-
-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','resultList_Zoom',2,1,'zoom functionality for resultList','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_Zoom.js','','resultList,mapframe1','','http://www.mapbender.org/resultList_Zoom');
-
-
-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','resultList',2,1,'','Result List','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','div','mod_ResultList.js','../../lib/resultGeometryListController.js, ../../lib/resultGeometryListModel.js','mapframe1','','');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'position', '[600,50]', 'position of the result list dialog' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'resultListHeight', '400', 'height of the result list dialog' ,'var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui1', 'resultList', 'resultListTitle', 'Search results', 'title of the result list dialog' ,'var');
-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');
-
-UPDATE gui_element set e_width = 220 where fkey_gui_id = 'gui_digitize' and e_id = 'treeGDE';
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', '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_digitize', 'treeGDE', 'enlargetreewidthopacity', 'true', '' ,'var');
More information about the Mapbender_commits
mailing list