BEGIN; INSERT INTO config.upgrade_log (version) VALUES ('0282'); INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype) VALUES ('history.hold.retention_age', TRUE, 'Historical Hold Retention Age', 'Historical Hold Retention Age', 'interval'); INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype) VALUES ('history.hold.retention_count', TRUE, 'Historical Hold Retention Count', 'Historical Hold Retention Count', 'integer'); -- Logic reversal, fixing CREATE OR REPLACE FUNCTION action.usr_visible_circs (usr_id INT) RETURNS SETOF action.circulation AS $func$ DECLARE c action.circulation%ROWTYPE; view_age INTERVAL; usr_view_age actor.usr_setting%ROWTYPE; usr_view_start actor.usr_setting%ROWTYPE; BEGIN SELECT * INTO usr_view_age FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.circ.retention_age'; SELECT * INTO usr_view_start FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.circ.retention_start_date'; IF usr_view_age.value IS NOT NULL AND usr_view_start.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; ELSIF usr_view_start.value IS NOT NULL THEN -- User opted in view_age := AGE(NOW(), oils_json_to_string(usr_view_start.value)::TIMESTAMPTZ); ELSE -- User did not opt in RETURN; END IF; FOR c IN SELECT * FROM action.circulation WHERE usr = usr_id AND parent_circ IS NULL AND xact_start > NOW() - view_age ORDER BY xact_start LOOP RETURN NEXT c; END LOOP; RETURN; END; $func$ LANGUAGE PLPGSQL; 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; 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'; 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; RETURN; END IF; IF usr_view_age.value IS NOT NULL THEN view_age := oils_json_to_string(usr_view_age.value)::INTERVAL; ELSE view_age := '2000 years'::INTERVAL; END IF; IF usr_view_count.value IS NOT NULL THEN view_count := oils_json_to_string(usr_view_count.value)::INT; ELSE view_count := 1000; END IF; -- Else, show those /and/ 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 LIMIT view_count LOOP RETURN NEXT h; END LOOP; RETURN; END; $func$ LANGUAGE PLPGSQL; COMMIT;