[open-ils-commits] r16540 - in trunk/Open-ILS/src/sql/Pg: . upgrade (miker)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Jun 1 10:48:14 EDT 2010
Author: miker
Date: 2010-06-01 10:48:11 -0400 (Tue, 01 Jun 2010)
New Revision: 16540
Added:
trunk/Open-ILS/src/sql/Pg/upgrade/0287.schema.action.usr_visible_holds-retention_start.sql
Modified:
trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
trunk/Open-ILS/src/sql/Pg/090.schema.action.sql
trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
add usr_setting_type of history.hold.retention_start for setting "opt-in" date of holds retention
Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-06-01 06:14:27 UTC (rev 16539)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-06-01 14:48:11 UTC (rev 16540)
@@ -65,7 +65,7 @@
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0286'); -- Scott McKellar
+INSERT INTO config.upgrade_log (version) VALUES ('0287'); -- miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
Modified: trunk/Open-ILS/src/sql/Pg/090.schema.action.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/090.schema.action.sql 2010-06-01 06:14:27 UTC (rev 16539)
+++ trunk/Open-ILS/src/sql/Pg/090.schema.action.sql 2010-06-01 14:48:11 UTC (rev 16540)
@@ -623,30 +623,37 @@
view_count INT;
usr_view_count actor.usr_setting%ROWTYPE;
usr_view_age actor.usr_setting%ROWTYPE;
+ usr_view_start actor.usr_setting%ROWTYPE;
BEGIN
SELECT * INTO usr_view_count FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_count';
SELECT * INTO usr_view_age FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_age';
+ SELECT * INTO usr_view_start FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_start';
- IF usr_view_count.value IS NULL AND usr_view_age.value IS NULL THEN
- -- Only show "open" holds
- FOR h IN
- SELECT *
- FROM action.hold_request
- WHERE usr = usr_id
- AND fulfillment_time IS NULL
- AND cancel_time IS NULL
- ORDER BY xact_start
- LOOP
- RETURN NEXT h;
- END LOOP;
+ FOR h IN
+ SELECT *
+ FROM action.hold_request
+ WHERE usr = usr_id
+ AND fulfillment_time IS NULL
+ AND cancel_time IS NULL
+ ORDER BY request_time DESC
+ LOOP
+ RETURN NEXT h;
+ END LOOP;
+ IF usr_view_start.value IS NULL THEN
RETURN;
END IF;
IF usr_view_age.value IS NOT NULL THEN
- view_age := oils_json_to_text(usr_view_age.value)::INTERVAL;
+ -- User opted in and supplied a retention age
+ IF oils_json_to_string(usr_view_age.value)::INTERVAL > AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ) THEN
+ view_age := AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ);
+ ELSE
+ view_age := oils_json_to_string(usr_view_age.value)::INTERVAL;
+ END IF;
ELSE
- view_age := '2000 years'::INTERVAL;
+ -- User opted in
+ view_age := AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ);
END IF;
IF usr_view_count.value IS NOT NULL THEN
@@ -655,20 +662,14 @@
view_count := 1000;
END IF;
- -- Else, show those /and/ some fulfilled/canceled holds
+ -- show some fulfilled/canceled holds
FOR h IN
SELECT *
FROM action.hold_request
WHERE usr = usr_id
- AND fulfillment_time IS NULL
- AND cancel_time IS NULL
- UNION ALL
- SELECT *
- FROM action.hold_request
- WHERE usr = usr_id
AND ( fulfillment_time IS NOT NULL OR cancel_time IS NOT NULL )
AND request_time > NOW() - view_age
- ORDER BY request_time
+ ORDER BY request_time DESC
LIMIT view_count
LOOP
RETURN NEXT h;
Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-06-01 06:14:27 UTC (rev 16539)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-06-01 14:48:11 UTC (rev 16540)
@@ -5191,6 +5191,12 @@
oils_i18n_gettext('history.hold.retention_age','Historical Hold Retention Age','cust','description'),
'interval'
),(
+ 'history.hold.retention_start',
+ TRUE,
+ oils_i18n_gettext('history.hold.retention_start','Historical Hold Retention Start Date','cust','label'),
+ oils_i18n_gettext('history.hold.retention_start','Historical Hold Retention Start Date','cust','description'),
+ 'interval'
+ ),(
'history.hold.retention_count',
TRUE,
oils_i18n_gettext('history.hold.retention_count','Historical Hold Retention Count','cust','label'),
Added: trunk/Open-ILS/src/sql/Pg/upgrade/0287.schema.action.usr_visible_holds-retention_start.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0287.schema.action.usr_visible_holds-retention_start.sql (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0287.schema.action.usr_visible_holds-retention_start.sql 2010-06-01 14:48:11 UTC (rev 16540)
@@ -0,0 +1,72 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0287'); --miker
+
+INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
+ VALUES ('history.hold.retention_start', FALSE, 'Historical Hold Retention Start Date', 'Historical Hold Retention Start Date', 'date');
+
+CREATE OR REPLACE FUNCTION action.usr_visible_holds (usr_id INT) RETURNS SETOF action.hold_request AS $func$
+DECLARE
+ h action.hold_request%ROWTYPE;
+ view_age INTERVAL;
+ view_count INT;
+ usr_view_count actor.usr_setting%ROWTYPE;
+ usr_view_age actor.usr_setting%ROWTYPE;
+ usr_view_start actor.usr_setting%ROWTYPE;
+BEGIN
+ SELECT * INTO usr_view_count FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_count';
+ SELECT * INTO usr_view_age FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_age';
+ SELECT * INTO usr_view_start FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_start';
+
+ FOR h IN
+ SELECT *
+ FROM action.hold_request
+ WHERE usr = usr_id
+ AND fulfillment_time IS NULL
+ AND cancel_time IS NULL
+ ORDER BY request_time DESC
+ LOOP
+ RETURN NEXT h;
+ END LOOP;
+
+ IF usr_view_start.value IS NULL THEN
+ RETURN;
+ END IF;
+
+ IF usr_view_age.value IS NOT NULL THEN
+ -- User opted in and supplied a retention age
+ IF oils_json_to_string(usr_view_age.value)::INTERVAL > AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ) THEN
+ view_age := AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ);
+ ELSE
+ view_age := oils_json_to_string(usr_view_age.value)::INTERVAL;
+ END IF;
+ ELSE
+ -- User opted in
+ view_age := AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ);
+ END IF;
+
+ IF usr_view_count.value IS NOT NULL THEN
+ view_count := oils_json_to_text(usr_view_count.value)::INT;
+ ELSE
+ view_count := 1000;
+ END IF;
+
+ -- show some fulfilled/canceled holds
+ FOR h IN
+ SELECT *
+ FROM action.hold_request
+ WHERE usr = usr_id
+ AND ( fulfillment_time IS NOT NULL OR cancel_time IS NOT NULL )
+ AND request_time > NOW() - view_age
+ ORDER BY request_time DESC
+ LIMIT view_count
+ LOOP
+ RETURN NEXT h;
+ END LOOP;
+
+ RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;
+
More information about the open-ils-commits
mailing list