[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2888b409b32cfe541247cc2e39ba23d0e19170c6
Evergreen Git
git at git.evergreen-ils.org
Mon Aug 22 14:09:29 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 2888b409b32cfe541247cc2e39ba23d0e19170c6 (commit)
via da240e76b8a16cf7e079ab09b1fd8571a4d68818 (commit)
from c597e8f644afc216f7ed86e01765da12a79f6780 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2888b409b32cfe541247cc2e39ba23d0e19170c6
Author: Kathy Lussier <klussier at masslnc.org>
Date: Mon Aug 22 14:02:58 2016 -0400
LP#1613730: Stamping upgrade script for copy count badge
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 3c897ab..976361c 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0989', :eg_version); -- berick/miker/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0990', :eg_version); -- miker/kmlussier
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy-count-badge.sql b/Open-ILS/src/sql/Pg/upgrade/0990.data.copy-count-badge.sql
similarity index 93%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy-count-badge.sql
rename to Open-ILS/src/sql/Pg/upgrade/0990.data.copy-count-badge.sql
index 84d36da..ce9d8f0 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy-count-badge.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0990.data.copy-count-badge.sql
@@ -1,5 +1,7 @@
BEGIN;
+SELECT evergreen.upgrade_deps_block_check('0990', :eg_version);
+
CREATE OR REPLACE FUNCTION rating.copy_count(badge_id INT)
RETURNS TABLE (record INT, value NUMERIC) AS $f$
DECLARE
commit da240e76b8a16cf7e079ab09b1fd8571a4d68818
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Aug 18 12:58:25 2016 -0400
LP#1613730: Add a "Copy Count" rating function for badges
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/sql/Pg/220.schema.rating.sql b/Open-ILS/src/sql/Pg/220.schema.rating.sql
index 460fc36..3494a7b 100644
--- a/Open-ILS/src/sql/Pg/220.schema.rating.sql
+++ b/Open-ILS/src/sql/Pg/220.schema.rating.sql
@@ -77,7 +77,9 @@ INSERT INTO rating.popularity_parameter (id,name,func,require_horizon,require_im
(12,'On-line Bib has attributes','rating.generic_fixed_rating_by_uri',FALSE,FALSE,FALSE),
(13,'Bib has attributes and copies','rating.generic_fixed_rating_by_copy',FALSE,FALSE,FALSE),
(14,'Bib has attributes and copies or URIs','rating.generic_fixed_rating_by_copy_or_uri',FALSE,FALSE,FALSE),
- (15,'Bib has attributes','rating.generic_fixed_rating_global',FALSE,FALSE,FALSE);
+ (15,'Bib has attributes','rating.generic_fixed_rating_global',FALSE,FALSE,FALSE),
+ (16,'Copy Count','rating.copy_count',FALSE,FALSE,TRUE);
+
CREATE TABLE rating.badge (
id SERIAL PRIMARY KEY,
@@ -901,5 +903,33 @@ BEGIN
END;
$f$ LANGUAGE PLPGSQL STRICT;
+CREATE OR REPLACE FUNCTION rating.copy_count(badge_id INT)
+ RETURNS TABLE (record INT, value NUMERIC) AS $f$
+DECLARE
+ badge rating.badge_with_orgs%ROWTYPE;
+BEGIN
+
+ SELECT * INTO badge FROM rating.badge_with_orgs WHERE id = badge_id;
+
+ PERFORM rating.precalc_bibs_by_copy(badge_id);
+
+ DELETE FROM precalc_copy_filter_bib_list WHERE id NOT IN (
+ SELECT id FROM precalc_filter_bib_list
+ INTERSECT
+ SELECT id FROM precalc_bibs_by_copy_list
+ );
+ ANALYZE precalc_copy_filter_bib_list;
+
+ RETURN QUERY
+ SELECT f.id::INT AS bib,
+ COUNT(f.copy)::NUMERIC
+ FROM precalc_copy_filter_bib_list f
+ JOIN asset.copy cp ON (f.copy = cp.id)
+ JOIN asset.call_number cn ON (cn.id = cp.call_number)
+ WHERE cn.owning_lib = ANY (badge.orgs) GROUP BY 1;
+
+END;
+$f$ LANGUAGE PLPGSQL STRICT;
+
COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy-count-badge.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy-count-badge.sql
new file mode 100644
index 0000000..84d36da
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.copy-count-badge.sql
@@ -0,0 +1,34 @@
+BEGIN;
+
+CREATE OR REPLACE FUNCTION rating.copy_count(badge_id INT)
+ RETURNS TABLE (record INT, value NUMERIC) AS $f$
+DECLARE
+ badge rating.badge_with_orgs%ROWTYPE;
+BEGIN
+
+ SELECT * INTO badge FROM rating.badge_with_orgs WHERE id = badge_id;
+
+ PERFORM rating.precalc_bibs_by_copy(badge_id);
+
+ DELETE FROM precalc_copy_filter_bib_list WHERE id NOT IN (
+ SELECT id FROM precalc_filter_bib_list
+ INTERSECT
+ SELECT id FROM precalc_bibs_by_copy_list
+ );
+ ANALYZE precalc_copy_filter_bib_list;
+
+ RETURN QUERY
+ SELECT f.id::INT AS bib,
+ COUNT(f.copy)::NUMERIC
+ FROM precalc_copy_filter_bib_list f
+ JOIN asset.copy cp ON (f.copy = cp.id)
+ JOIN asset.call_number cn ON (cn.id = cp.call_number)
+ WHERE cn.owning_lib = ANY (badge.orgs) GROUP BY 1;
+
+END;
+$f$ LANGUAGE PLPGSQL STRICT;
+
+INSERT INTO rating.popularity_parameter (name, func, require_percentile) VALUES ('Copy Count', 'rating.copy_count', TRUE);
+
+COMMIT;
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/220.schema.rating.sql | 32 +++++++++++++++++-
.../sql/Pg/upgrade/0990.data.copy-count-badge.sql | 36 ++++++++++++++++++++
3 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0990.data.copy-count-badge.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list