[Mapbender-commits] r9516 - in trunk/mapbender/resources/db: . pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-06-09 02:15:49 -0700 (Thu, 09 Jun 2016)
New Revision: 9516

Modified:
   trunk/mapbender/resources/db/materialize_dataset_view.sql
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql
Log:
Fix missing index in dataset_search_table, alter type of ref_system column to varchar(150) ;-) in mb_metadata

Modified: trunk/mapbender/resources/db/materialize_dataset_view.sql
===================================================================
--- trunk/mapbender/resources/db/materialize_dataset_view.sql	2016-06-09 09:14:41 UTC (rev 9515)
+++ trunk/mapbender/resources/db/materialize_dataset_view.sql	2016-06-09 09:15:49 UTC (rev 9516)
@@ -17,6 +17,15 @@
   USING gist
   (the_geom);
 
+-- Index: idx_wst_dataset_searchtext
+
+-- DROP INDEX idx_wst_dataset_searchtext;
+
+CREATE INDEX idx_wst_dataset_searchtext
+  ON dataset_search_table
+  USING btree
+  (searchtext);
+
 -- Index: idx_wst_dataset_department
 
 -- DROP INDEX idx_wst_dataset_department;

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql	2016-06-09 09:14:41 UTC (rev 9515)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.4_to_2.8_pgsql_UTF-8.sql	2016-06-09 09:15:49 UTC (rev 9516)
@@ -1115,3 +1115,23 @@
 DELETE FROM gui_element WHERE fkey_gui_id = 'admin_wfs_metadata' AND e_id = 'mb_metadata_gml_import';
 
 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('admin_wfs_metadata','mb_metadata_gml_import',1,1,'','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','div','../plugins/mb_metadata_gml_import.js','','','','');
+
+
+DROP VIEW search_dataset_view;
+
+ALTER TABLE mb_metadata ALTER COLUMN ref_system TYPE VARCHAR(150);
+CREATE OR REPLACE VIEW search_dataset_view AS 
+
+SELECT DISTINCT ON (metadata_id) * FROM ( SELECT dataset_dep.fkey_mb_user_id AS user_id, dataset_dep.dataset_id, dataset_dep.dataset_id AS metadata_id, dataset_dep.srs AS dataset_srs, dataset_dep.title, dataset_dep.abstract AS dataset_abstract, dataset_dep.accessconstraints, dataset_dep.isopen, dataset_dep.termsofuse, f_collect_searchtext_dataset(dataset_dep.dataset_id) AS searchtext, dataset_dep.dataset_timestamp, dataset_dep.department, dataset_dep.mb_group_name, dataset_dep.mb_group_title, dataset_dep.mb_group_country, CASE WHEN load_count IS NULL THEN 0 ELSE load_count END as load_count, dataset_dep.mb_group_stateorprovince, f_collect_inspire_cat_dataset(dataset_dep.dataset_id) AS md_inspire_cats, f_collect_custom_cat_dataset(dataset_dep.dataset_id) AS md_custom_cats, f_collect_topic_cat_dataset(dataset_dep.dataset_id) AS md_topic_cats, dataset_dep.bbox AS the_geom, (((((st_xmin(dataset_dep.bbox::box3d)::text || ','::text) || st_ymin(dataset_dep.bbox::box3d)::text) || ','::text)
  || st_xmax(dataset_dep.bbox::box3d)::text) || ','::text) || st_ymax(dataset_dep.bbox::box3d)::text AS bbox, dataset_dep.preview_url, dataset_dep.fileidentifier, f_get_coupled_resources(dataset_dep.dataset_id) AS coupled_resources, dataset_dep.mb_group_logo_path, dataset_dep.timebegin::date, CASE WHEN update_frequency = 'continual' THEN now()::date WHEN update_frequency = 'daily' THEN now()::date WHEN update_frequency = 'weekly' THEN (now() - interval '7 day')::date WHEN update_frequency = 'fortnightly' THEN (now() - interval '14 day')::date WHEN update_frequency = 'monthly' THEN (now() -interval '1 month')::date WHEN update_frequency = 'quarterly' THEN (now() - interval '3 month')::date WHEN update_frequency = 'biannually' THEN (now() - interval '6 month')::date WHEN update_frequency = 'annually' THEN (now() - interval '12 month')::date ELSE dataset_dep.timeend::date END AS timeend
+   FROM ( SELECT mb_metadata.the_geom AS bbox, mb_metadata.ref_system AS srs, mb_metadata.metadata_id AS dataset_id, mb_metadata.title, mb_metadata.abstract, mb_metadata.lastchanged AS dataset_timestamp, mb_metadata.tmp_reference_1 as timeBegin, mb_metadata.tmp_reference_2 as timeEnd, mb_metadata.uuid AS fileidentifier, mb_metadata.preview_image AS preview_url, mb_metadata.load_count as load_count, mb_metadata.fkey_mb_user_id, mb_metadata.constraints as accessconstraints,mb_metadata.update_frequency as update_frequency, f_getmd_tou(mb_metadata.metadata_id) AS termsofuse, f_tou_isopen(f_getmd_tou(mb_metadata.metadata_id)) AS isopen, user_dep.mb_group_id AS department, user_dep.mb_group_name, user_dep.mb_group_title, user_dep.mb_group_country, user_dep.mb_group_stateorprovince, user_dep.mb_group_logo_path
+           FROM ( SELECT registrating_groups.fkey_mb_user_id AS mb_user_id, mb_group.mb_group_id, mb_group.mb_group_name, mb_group.mb_group_title, mb_group.mb_group_country, mb_group.mb_group_stateorprovince, mb_group.mb_group_logo_path
+                   FROM registrating_groups, mb_group
+                  WHERE registrating_groups.fkey_mb_group_id = mb_group.mb_group_id) user_dep, (SELECT mb_metadata.* ,metadata_load_count.load_count FROM mb_metadata LEFT JOIN metadata_load_count ON mb_metadata.metadata_id = metadata_load_count.fkey_metadata_id) AS mb_metadata
+          WHERE user_dep.mb_user_id = mb_metadata.fkey_mb_user_id AND mb_metadata.the_geom IS NOT NULL) dataset_dep
+  ORDER BY dataset_dep.dataset_id) AS datasets;
+
+ALTER TABLE search_dataset_view
+  OWNER TO postgres;
+
+
+