From 9701f4a43a7d95326f4efdcd4132d533251e5ccf Mon Sep 17 00:00:00 2001 From: John Date: Mon, 23 Nov 2015 10:11:16 +0000 Subject: [PATCH 1/2] Fixes #42 - mtbqqq support when building cache_occurrences Reference to system mtb was incorrect - should have been mtbqqq. --- ..._srid.sql => 201511231004_sref_system_to_srid.sql} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) rename modules/indicia_setup/db/version_0_9_1/{201511040918_sref_system_to_srid.sql => 201511231004_sref_system_to_srid.sql} (67%) diff --git a/modules/indicia_setup/db/version_0_9_1/201511040918_sref_system_to_srid.sql b/modules/indicia_setup/db/version_0_9_1/201511231004_sref_system_to_srid.sql similarity index 67% rename from modules/indicia_setup/db/version_0_9_1/201511040918_sref_system_to_srid.sql rename to modules/indicia_setup/db/version_0_9_1/201511231004_sref_system_to_srid.sql index 248aaa6f87..f88c026145 100644 --- a/modules/indicia_setup/db/version_0_9_1/201511040918_sref_system_to_srid.sql +++ b/modules/indicia_setup/db/version_0_9_1/201511231004_sref_system_to_srid.sql @@ -1,12 +1,12 @@ -CREATE OR REPLACE FUNCTION sref_system_to_srid(IN sref_system CHARACTER VARYING) - RETURNS INTEGER AS - $BODY$ +CREATE OR REPLACE FUNCTION sref_system_to_srid(sref_system character varying) + RETURNS integer AS +$BODY$ BEGIN RETURN CASE lower(sref_system) WHEN 'osgb' THEN 27700 WHEN 'osie' THEN 29901 WHEN 'lugr' THEN 2169 - WHEN 'mtb' THEN 4745 + WHEN 'mtbqqq' THEN 4745 WHEN 'guernsey' THEN 3108 WHEN 'jersey' THEN 3109 WHEN 'utm30ed50' THEN 23030 @@ -15,4 +15,5 @@ CREATE OR REPLACE FUNCTION sref_system_to_srid(IN sref_system CHARACTER VARYING) END; END; $BODY$ -LANGUAGE plpgsql VOLATILE; \ No newline at end of file + LANGUAGE plpgsql VOLATILE + COST 100; \ No newline at end of file From 534baedf44f2ba8816d2ca4625e54b3f64fd4933 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 23 Nov 2015 10:22:03 +0000 Subject: [PATCH 2/2] Version bump --- application/config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/config/version.php b/application/config/version.php index a6a7a732e7..07971739de 100644 --- a/application/config/version.php +++ b/application/config/version.php @@ -26,8 +26,8 @@ /** * @var string The application files version number. */ -$config['version'] = '0.9.1.11'; -$config['release_date'] = '2015-11-10'; +$config['version'] = '0.9.1.12'; +$config['release_date'] = '2015-11-23'; $config['repository'] = 'https://github.com/Indicia-Team/warehouse/releases'; ?>