[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. aec65bd03b02d9ba26ae3e0819afbf7cfe522ed7
Evergreen Git
git at git.evergreen-ils.org
Thu Jan 16 15:45:27 EST 2014
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 aec65bd03b02d9ba26ae3e0819afbf7cfe522ed7 (commit)
via 9c7b271e94b900d2e11aab35ad69a7ed88825e1e (commit)
from 9a010a19dc2bde9a78c60aa50a9c5b0b32a996c8 (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 aec65bd03b02d9ba26ae3e0819afbf7cfe522ed7
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Jan 16 15:44:58 2014 -0500
Renumbering the test
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/live_t/XXXX.fixed_field_enhancements.pg b/Open-ILS/src/sql/Pg/live_t/0852.fixed_field_enhancements.pg
similarity index 100%
rename from Open-ILS/src/sql/Pg/live_t/XXXX.fixed_field_enhancements.pg
rename to Open-ILS/src/sql/Pg/live_t/0852.fixed_field_enhancements.pg
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.prox_adjust.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.function.prox_adjust.sql
deleted file mode 100644
index aeb03ea..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.prox_adjust.sql
+++ /dev/null
@@ -1,95 +0,0 @@
-BEGIN;
-
-CREATE OR REPLACE FUNCTION action.hold_copy_calculated_proximity(
- ahr_id INT,
- acp_id BIGINT,
- copy_context_ou INT DEFAULT NULL
- -- TODO maybe? hold_context_ou INT DEFAULT NULL. This would optionally
- -- support an "ahprox" measurement: adjust prox between copy circ lib and
- -- hold request lib, but I'm unsure whether to use this theoretical
- -- argument only in the baseline calculation or later in the other
- -- queries in this function.
-) RETURNS NUMERIC AS $f$
-DECLARE
- aoupa actor.org_unit_proximity_adjustment%ROWTYPE;
- ahr action.hold_request%ROWTYPE;
- acp asset.copy%ROWTYPE;
- acn asset.call_number%ROWTYPE;
- acl asset.copy_location%ROWTYPE;
- baseline_prox NUMERIC;
-
- icl_list INT[];
- iol_list INT[];
- isl_list INT[];
- hpl_list INT[];
- hrl_list INT[];
-
-BEGIN
-
- SELECT * INTO ahr FROM action.hold_request WHERE id = ahr_id;
- SELECT * INTO acp FROM asset.copy WHERE id = acp_id;
- SELECT * INTO acn FROM asset.call_number WHERE id = acp.call_number;
- SELECT * INTO acl FROM asset.copy_location WHERE id = acp.location;
-
- IF copy_context_ou IS NULL THEN
- copy_context_ou := acp.circ_lib;
- END IF;
-
- -- First, gather the baseline proximity of "here" to pickup lib
- SELECT prox INTO baseline_prox FROM actor.org_unit_proximity WHERE from_org = copy_context_ou AND to_org = ahr.pickup_lib;
-
- -- Find any absolute adjustments, and set the baseline prox to that
- SELECT adj.* INTO aoupa
- FROM actor.org_unit_proximity_adjustment adj
- LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib)
- LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib)
- LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acl_ol.id = adj.copy_location)
- LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib)
- LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib)
- WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND
- (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND
- (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND
- (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND
- (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND
- (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND
- absolute_adjustment AND
- COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL
- ORDER BY
- COALESCE(acp_cl.distance,999)
- + COALESCE(acn_ol.distance,999)
- + COALESCE(acl_ol.distance,999)
- + COALESCE(ahr_pl.distance,999)
- + COALESCE(ahr_rl.distance,999),
- adj.pos
- LIMIT 1;
-
- IF FOUND THEN
- baseline_prox := aoupa.prox_adjustment;
- END IF;
-
- -- Now find any relative adjustments, and change the baseline prox based on them
- FOR aoupa IN
- SELECT adj.*
- FROM actor.org_unit_proximity_adjustment adj
- LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib)
- LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib)
- LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acn_ol.id = adj.copy_location)
- LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib)
- LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib)
- WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND
- (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND
- (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND
- (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND
- (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND
- (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND
- NOT absolute_adjustment AND
- COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL
- LOOP
- baseline_prox := baseline_prox + aoupa.prox_adjustment;
- END LOOP;
-
- RETURN baseline_prox;
-END;
-$f$ LANGUAGE PLPGSQL;
-
-COMMIT;
commit 9c7b271e94b900d2e11aab35ad69a7ed88825e1e
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Jan 16 15:44:48 2014 -0500
Renumbering the upgrade script
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 27e27c5..e66e8e4 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 ('0851', :eg_version); -- dbs/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0852', :eg_version); -- miker/senator
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0852.function.prox_adjust.sql b/Open-ILS/src/sql/Pg/upgrade/0852.function.prox_adjust.sql
new file mode 100644
index 0000000..cfe8225
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0852.function.prox_adjust.sql
@@ -0,0 +1,97 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0852', :eg_version);
+
+CREATE OR REPLACE FUNCTION action.hold_copy_calculated_proximity(
+ ahr_id INT,
+ acp_id BIGINT,
+ copy_context_ou INT DEFAULT NULL
+ -- TODO maybe? hold_context_ou INT DEFAULT NULL. This would optionally
+ -- support an "ahprox" measurement: adjust prox between copy circ lib and
+ -- hold request lib, but I'm unsure whether to use this theoretical
+ -- argument only in the baseline calculation or later in the other
+ -- queries in this function.
+) RETURNS NUMERIC AS $f$
+DECLARE
+ aoupa actor.org_unit_proximity_adjustment%ROWTYPE;
+ ahr action.hold_request%ROWTYPE;
+ acp asset.copy%ROWTYPE;
+ acn asset.call_number%ROWTYPE;
+ acl asset.copy_location%ROWTYPE;
+ baseline_prox NUMERIC;
+
+ icl_list INT[];
+ iol_list INT[];
+ isl_list INT[];
+ hpl_list INT[];
+ hrl_list INT[];
+
+BEGIN
+
+ SELECT * INTO ahr FROM action.hold_request WHERE id = ahr_id;
+ SELECT * INTO acp FROM asset.copy WHERE id = acp_id;
+ SELECT * INTO acn FROM asset.call_number WHERE id = acp.call_number;
+ SELECT * INTO acl FROM asset.copy_location WHERE id = acp.location;
+
+ IF copy_context_ou IS NULL THEN
+ copy_context_ou := acp.circ_lib;
+ END IF;
+
+ -- First, gather the baseline proximity of "here" to pickup lib
+ SELECT prox INTO baseline_prox FROM actor.org_unit_proximity WHERE from_org = copy_context_ou AND to_org = ahr.pickup_lib;
+
+ -- Find any absolute adjustments, and set the baseline prox to that
+ SELECT adj.* INTO aoupa
+ FROM actor.org_unit_proximity_adjustment adj
+ LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib)
+ LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib)
+ LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acl_ol.id = adj.copy_location)
+ LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib)
+ LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib)
+ WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND
+ (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND
+ (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND
+ (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND
+ (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND
+ (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND
+ absolute_adjustment AND
+ COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL
+ ORDER BY
+ COALESCE(acp_cl.distance,999)
+ + COALESCE(acn_ol.distance,999)
+ + COALESCE(acl_ol.distance,999)
+ + COALESCE(ahr_pl.distance,999)
+ + COALESCE(ahr_rl.distance,999),
+ adj.pos
+ LIMIT 1;
+
+ IF FOUND THEN
+ baseline_prox := aoupa.prox_adjustment;
+ END IF;
+
+ -- Now find any relative adjustments, and change the baseline prox based on them
+ FOR aoupa IN
+ SELECT adj.*
+ FROM actor.org_unit_proximity_adjustment adj
+ LEFT JOIN actor.org_unit_ancestors_distance(copy_context_ou) acp_cl ON (acp_cl.id = adj.item_circ_lib)
+ LEFT JOIN actor.org_unit_ancestors_distance(acn.owning_lib) acn_ol ON (acn_ol.id = adj.item_owning_lib)
+ LEFT JOIN actor.org_unit_ancestors_distance(acl.owning_lib) acl_ol ON (acn_ol.id = adj.copy_location)
+ LEFT JOIN actor.org_unit_ancestors_distance(ahr.pickup_lib) ahr_pl ON (ahr_pl.id = adj.hold_pickup_lib)
+ LEFT JOIN actor.org_unit_ancestors_distance(ahr.request_lib) ahr_rl ON (ahr_rl.id = adj.hold_request_lib)
+ WHERE (adj.circ_mod IS NULL OR adj.circ_mod = acp.circ_modifier) AND
+ (adj.item_circ_lib IS NULL OR adj.item_circ_lib = acp_cl.id) AND
+ (adj.item_owning_lib IS NULL OR adj.item_owning_lib = acn_ol.id) AND
+ (adj.copy_location IS NULL OR adj.copy_location = acl_ol.id) AND
+ (adj.hold_pickup_lib IS NULL OR adj.hold_pickup_lib = ahr_pl.id) AND
+ (adj.hold_request_lib IS NULL OR adj.hold_request_lib = ahr_rl.id) AND
+ NOT absolute_adjustment AND
+ COALESCE(acp_cl.id, acn_ol.id, acl_ol.id, ahr_pl.id, ahr_rl.id) IS NOT NULL
+ LOOP
+ baseline_prox := baseline_prox + aoupa.prox_adjustment;
+ END LOOP;
+
+ RETURN baseline_prox;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
...cements.pg => 0852.fixed_field_enhancements.pg} | 0
...ox_adjust.sql => 0852.function.prox_adjust.sql} | 2 ++
3 files changed, 3 insertions(+), 1 deletions(-)
rename Open-ILS/src/sql/Pg/live_t/{XXXX.fixed_field_enhancements.pg => 0852.fixed_field_enhancements.pg} (100%)
rename Open-ILS/src/sql/Pg/upgrade/{XXXX.function.prox_adjust.sql => 0852.function.prox_adjust.sql} (98%)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list