From f58f70dc9222defd62227ae5f148fad30d3c23df Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Tue, 16 Jan 2018 18:54:47 -0500 Subject: [PATCH] LP#1743650: Bib vis testing needs different handling For bib-level visibility testing, we can only use the source helper for positive inclusion, and have to deal with LURIs on a case-by-case basis. This is because, unlike the copy visibility cache, the LURI cache is pre- composed in a single value for all LURIs on a record, not separate ones for each. This is fine, as we just need to find the effectively visible org units and test for that subset of the relevant orgs. This commit provides a sub to test for that, and handles LURI test composition at the perl level rather than in the database. Signed-off-by: Mike Rylander Signed-off-by: Kathy Lussier --- .../XXXX.function.special-bib-vis-handling.sql | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.special-bib-vis-handling.sql diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.special-bib-vis-handling.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.function.special-bib-vis-handling.sql new file mode 100644 index 0000000000..11c5a2d098 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.function.special-bib-vis-handling.sql @@ -0,0 +1,49 @@ +BEGIN; + +CREATE OR REPLACE FUNCTION asset.patron_default_visibility_mask () RETURNS TABLE (b_attrs TEXT, c_attrs TEXT) AS $f$ +DECLARE + copy_flags TEXT; -- "c" attr + + owning_lib TEXT; -- "c" attr + circ_lib TEXT; -- "c" attr + status TEXT; -- "c" attr + location TEXT; -- "c" attr + location_group TEXT; -- "c" attr + + luri_org TEXT; -- "b" attr + bib_sources TEXT; -- "b" attr + + bib_tests TEXT := ''; +BEGIN + copy_flags := asset.all_visible_flags(); -- Will always have at least one + + owning_lib := NULLIF(asset.owning_lib_default(),'!()'); + + circ_lib := NULLIF(asset.circ_lib_default(),'!()'); + status := NULLIF(asset.status_default(),'!()'); + location := NULLIF(asset.location_default(),'!()'); + location_group := NULLIF(asset.location_group_default(),'!()'); + + -- LURIs will be handled at the perl layer directly + -- luri_org := NULLIF(asset.luri_org_default(),'!()'); + bib_sources := NULLIF(asset.bib_source_default(),'()'); + + + IF luri_org IS NOT NULL AND bib_sources IS NOT NULL THEN + bib_tests := '('||ARRAY_TO_STRING( ARRAY[luri_org,bib_sources], '|')||')&('||luri_org||')&'; + ELSIF luri_org IS NOT NULL THEN + bib_tests := luri_org || '&'; + ELSIF bib_sources IS NOT NULL THEN + bib_tests := bib_sources || '|'; + END IF; + + RETURN QUERY SELECT bib_tests, + '('||ARRAY_TO_STRING( + ARRAY[copy_flags,owning_lib,circ_lib,status,location,location_group]::TEXT[], + '&' + )||')'; +END; +$f$ LANGUAGE PLPGSQL STABLE ROWS 1; + +COMMIT; + -- 2.11.0