June 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch rel_3_14 updated. d2e6a09d931796915cdb8c83acae2fe24cf6711d
by Git User 23 Jun '25

23 Jun '25

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, rel_3_14 has been updated via d2e6a09d931796915cdb8c83acae2fe24cf6711d (commit) from 1997324a0167ef67848e29d8bc72cb132dedd78b (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 d2e6a09d931796915cdb8c83acae2fe24cf6711d Author: Ian Skelskey <ianskelskey(a)gmail.com> Date: Tue Jun 17 20:17:29 2025 -0400 LP#1952388: fix adding to Record Bucket from Item Status Detail View Correct the method call in the app.js file to ensure that items can be added to a Record Bucket from the Item Status Detail View. This resolves the issue where \"Add to Record Bucket\" fails silently due to a TypeError. - Change `itemSvc.add_records_to_bucket` to `itemSvc.add_copies_to_bucket` in the `add_records_to_bucket` function. Release-Note: fix inability to add items to Record Bucket from Item Status Detail View. Signed-off-by: Ian Skelskey <ianskelskey(a)gmail.com> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Shula Link <slink(a)gchrl.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index 146bad26b2..f76058619d 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -87,7 +87,7 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD } $scope.add_records_to_bucket = function() { - itemSvc.add_records_to_bucket([$scope.args.recordId], 'biblio'); + itemSvc.add_copies_to_bucket([$scope.args.recordId], 'biblio'); } $scope.show_in_catalog = function() { ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/item/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 4605e1f5e89e93f34a2e6471496424381f4448a1
by Git User 23 Jun '25

23 Jun '25

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, main has been updated via 4605e1f5e89e93f34a2e6471496424381f4448a1 (commit) from abdba83ff404d2a3291950d07b17a4c39b3123e5 (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 4605e1f5e89e93f34a2e6471496424381f4448a1 Author: Ian Skelskey <ianskelskey(a)gmail.com> Date: Tue Jun 17 20:17:29 2025 -0400 LP#1952388: fix adding to Record Bucket from Item Status Detail View Correct the method call in the app.js file to ensure that items can be added to a Record Bucket from the Item Status Detail View. This resolves the issue where \"Add to Record Bucket\" fails silently due to a TypeError. - Change `itemSvc.add_records_to_bucket` to `itemSvc.add_copies_to_bucket` in the `add_records_to_bucket` function. Release-Note: fix inability to add items to Record Bucket from Item Status Detail View. Signed-off-by: Ian Skelskey <ianskelskey(a)gmail.com> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Shula Link <slink(a)gchrl.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index 146bad26b2..f76058619d 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -87,7 +87,7 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD } $scope.add_records_to_bucket = function() { - itemSvc.add_records_to_bucket([$scope.args.recordId], 'biblio'); + itemSvc.add_copies_to_bucket([$scope.args.recordId], 'biblio'); } $scope.show_in_catalog = function() { ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/item/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. f1feb3855829497c128fe70b7a3e23f0c444ab50
by Git User 19 Jun '25

19 Jun '25

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, rel_3_15 has been updated via f1feb3855829497c128fe70b7a3e23f0c444ab50 (commit) via af457050d39a3b1aa23f34d38856b6b57c032bd1 (commit) via 9134aaf4af591fdd0ff4d4067d7606c9d71d6324 (commit) from 8bcb669c4793774ed278470e897741a92e381a50 (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 f1feb3855829497c128fe70b7a3e23f0c444ab50 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 09:40:44 2025 -0700 LP#1848375: stamp upgrade script Signed-off-by: Jane Sandberg <sandbergja(a)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 3b9b72b341..196126068b 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,7 +92,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 ('1472', :eg_version); -- terranm/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1474', :eg_version); -- jeffdavis/gmcharlt/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql similarity index 97% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql rename to Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql index 79d729de87..24bc1ed856 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql @@ -1,6 +1,6 @@ BEGIN; -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1474', :eg_version); CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$ DECLARE commit af457050d39a3b1aa23f34d38856b6b57c032bd1 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 09:36:58 2025 -0700 LP#1848375: follow-up: add a pgtap test I wrote a test to help me wrap my mind around the infinite loop. I'm checking it in in case it helps others to understand the function or prevents regressions. Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg b/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg new file mode 100644 index 0000000000..af57928482 --- /dev/null +++ b/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg @@ -0,0 +1,33 @@ +BEGIN; + +SELECT plan(1); + +-- The function under test previously had an infinite loop, which makes for a very +-- boring test-running experience. For this db session only, set a time limit of +-- 5 seconds. +SET statement_timeout = 5000; + +-- Create a queue +INSERT INTO vandelay.bib_queue (id, owner, name) VALUES (5555, 7, 'lp1848375 test bucket'); + +-- Enqueue a bib record and an item that matches a record in the collection +INSERT INTO vandelay.queued_bib_record(id, marc, queue) VALUES (7777, '<record><datafield tag="901" ind1=" " ind2=" "><subfield code="c">243</subfield></datafield></record>', 5555); +INSERT INTO vandelay.import_item (record, definition, owning_lib) VALUES ( + 7777, + 1, -- Evergreen holdings format + 9 -- Bookmobile 1, which already has some copies of bib record 243 +); + +PREPARE auto_overlay_with_items AS SELECT vandelay.auto_overlay_org_unit_copies( + 7777, + 2, -- full overlay + 0 -- quality ratio +); + +SELECT performs_ok( + 'auto_overlay_with_items', + 1000, + 'overlaying a record with items takes less than a second' +); + +ROLLBACK; commit 9134aaf4af591fdd0ff4d4067d7606c9d71d6324 Author: Jeff Davis <jdavis(a)sitka.bclibraries.ca> Date: Wed Oct 16 12:29:25 2019 -0700 LP#1848375: finesse while loop on vandelay.auto_overlay_org_unit_copies Release-note: Fixes bug where MARC import with items might never finish when "Use Org Unit Matching in Copy to Determine Best Match" is in effect Signed-off-by: Jeff Davis <jdavis(a)sitka.bclibraries.ca> Signed-off-by: Galen Charlton <gmc(a)equinoxOLI.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql index 77423e8182..0d4818f9de 100644 --- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql +++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql @@ -1916,7 +1916,8 @@ BEGIN FROM vandelay.import_item WHERE record = import_id; - WHILE CARDINALITY(scope_orgs) > 0 LOOP + WHILE CARDINALITY(scope_orgs) IS NOT NULL LOOP + EXIT WHEN CARDINALITY(scope_orgs) = 0; FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP -- For each match, get a count of all copies at descendants of our scope org. FOR rec IN SELECT * FROM vandelay.bib_match AS vbm @@ -1938,12 +1939,15 @@ BEGIN END LOOP; END LOOP; + EXIT WHEN eg_id IS NOT NULL; + -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate. IF max_copy_count = 0 THEN SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs FROM actor.org_unit WHERE id IN (SELECT * FROM UNNEST(scope_orgs)) AND parent_ou IS NOT NULL; + EXIT WHEN CARDINALITY(scope_orgs) IS NULL; END IF; END LOOP; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql new file mode 100644 index 0000000000..79d729de87 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql @@ -0,0 +1,79 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$ +DECLARE + eg_id BIGINT; + match_count INT; + rec vandelay.bib_match%ROWTYPE; + v_owning_lib INT; + scope_org INT; + scope_orgs INT[]; + copy_count INT := 0; + max_copy_count INT := 0; +BEGIN + + PERFORM * FROM vandelay.queued_bib_record WHERE import_time IS NOT NULL AND id = import_id; + + IF FOUND THEN + -- RAISE NOTICE 'already imported, cannot auto-overlay' + RETURN FALSE; + END IF; + + -- Gather all the owning libs for our import items. + -- These are our initial scope_orgs. + SELECT ARRAY_AGG(DISTINCT owning_lib) INTO scope_orgs + FROM vandelay.import_item + WHERE record = import_id; + + WHILE CARDINALITY(scope_orgs) IS NOT NULL LOOP + EXIT WHEN CARDINALITY(scope_orgs) = 0; + FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP + -- For each match, get a count of all copies at descendants of our scope org. + FOR rec IN SELECT * FROM vandelay.bib_match AS vbm + WHERE queued_record = import_id + ORDER BY vbm.eg_record DESC + LOOP + SELECT COUNT(acp.id) INTO copy_count + FROM asset.copy AS acp + INNER JOIN asset.call_number AS acn + ON acp.call_number = acn.id + WHERE acn.owning_lib IN (SELECT id FROM + actor.org_unit_descendants(scope_org)) + AND acn.record = rec.eg_record + AND acp.deleted = FALSE; + IF copy_count > max_copy_count THEN + max_copy_count := copy_count; + eg_id := rec.eg_record; + END IF; + END LOOP; + END LOOP; + + EXIT WHEN eg_id IS NOT NULL; + + -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate. + IF max_copy_count = 0 THEN + SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs + FROM actor.org_unit + WHERE id IN (SELECT * FROM UNNEST(scope_orgs)) + AND parent_ou IS NOT NULL; + EXIT WHEN CARDINALITY(scope_orgs) IS NULL; + END IF; + END LOOP; + + IF eg_id IS NULL THEN + -- Could not determine best match via copy count + -- fall back to default best match + IF (SELECT * FROM vandelay.auto_overlay_bib_record_with_best( import_id, merge_profile_id, lwm_ratio_value_p )) THEN + RETURN TRUE; + ELSE + RETURN FALSE; + END IF; + END IF; + + RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id ); +END; +$$ LANGUAGE PLPGSQL; + +COMMIT; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/012.schema.vandelay.sql | 6 +++- .../live_t/lp1848375_marc_import_auto_overlay.pg | 33 ++++++++++++++++++++++ ...hema.vandelay.auto_overlay_org_unit_copies.sql} | 8 ++++-- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg copy Open-ILS/src/sql/Pg/upgrade/{1186.schema.fix_auto_overlay_org_unit_copies.sql => 1474.schema.vandelay.auto_overlay_org_unit_copies.sql} (91%) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. abdba83ff404d2a3291950d07b17a4c39b3123e5
by Git User 19 Jun '25

19 Jun '25

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, main has been updated via abdba83ff404d2a3291950d07b17a4c39b3123e5 (commit) via 6ffc21ff748566a8554b360e15a61e23b203d976 (commit) via a04791d8c3f57ac1e7103a075bdd71230ac81b44 (commit) from d58439ece73259085a9f929da7d3529a45ab5837 (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 abdba83ff404d2a3291950d07b17a4c39b3123e5 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 09:40:44 2025 -0700 LP#1848375: stamp upgrade script Signed-off-by: Jane Sandberg <sandbergja(a)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 eba2c4a1b2..196126068b 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,7 +92,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 ('1473', :eg_version); -- smayo/redavis/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1474', :eg_version); -- jeffdavis/gmcharlt/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql similarity index 97% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql rename to Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql index 79d729de87..24bc1ed856 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql @@ -1,6 +1,6 @@ BEGIN; -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1474', :eg_version); CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$ DECLARE commit 6ffc21ff748566a8554b360e15a61e23b203d976 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 09:36:58 2025 -0700 LP#1848375: follow-up: add a pgtap test I wrote a test to help me wrap my mind around the infinite loop. I'm checking it in in case it helps others to understand the function or prevents regressions. Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg b/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg new file mode 100644 index 0000000000..af57928482 --- /dev/null +++ b/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg @@ -0,0 +1,33 @@ +BEGIN; + +SELECT plan(1); + +-- The function under test previously had an infinite loop, which makes for a very +-- boring test-running experience. For this db session only, set a time limit of +-- 5 seconds. +SET statement_timeout = 5000; + +-- Create a queue +INSERT INTO vandelay.bib_queue (id, owner, name) VALUES (5555, 7, 'lp1848375 test bucket'); + +-- Enqueue a bib record and an item that matches a record in the collection +INSERT INTO vandelay.queued_bib_record(id, marc, queue) VALUES (7777, '<record><datafield tag="901" ind1=" " ind2=" "><subfield code="c">243</subfield></datafield></record>', 5555); +INSERT INTO vandelay.import_item (record, definition, owning_lib) VALUES ( + 7777, + 1, -- Evergreen holdings format + 9 -- Bookmobile 1, which already has some copies of bib record 243 +); + +PREPARE auto_overlay_with_items AS SELECT vandelay.auto_overlay_org_unit_copies( + 7777, + 2, -- full overlay + 0 -- quality ratio +); + +SELECT performs_ok( + 'auto_overlay_with_items', + 1000, + 'overlaying a record with items takes less than a second' +); + +ROLLBACK; commit a04791d8c3f57ac1e7103a075bdd71230ac81b44 Author: Jeff Davis <jdavis(a)sitka.bclibraries.ca> Date: Wed Oct 16 12:29:25 2019 -0700 LP#1848375: finesse while loop on vandelay.auto_overlay_org_unit_copies Release-note: Fixes bug where MARC import with items might never finish when "Use Org Unit Matching in Copy to Determine Best Match" is in effect Signed-off-by: Jeff Davis <jdavis(a)sitka.bclibraries.ca> Signed-off-by: Galen Charlton <gmc(a)equinoxOLI.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql index 77423e8182..0d4818f9de 100644 --- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql +++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql @@ -1916,7 +1916,8 @@ BEGIN FROM vandelay.import_item WHERE record = import_id; - WHILE CARDINALITY(scope_orgs) > 0 LOOP + WHILE CARDINALITY(scope_orgs) IS NOT NULL LOOP + EXIT WHEN CARDINALITY(scope_orgs) = 0; FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP -- For each match, get a count of all copies at descendants of our scope org. FOR rec IN SELECT * FROM vandelay.bib_match AS vbm @@ -1938,12 +1939,15 @@ BEGIN END LOOP; END LOOP; + EXIT WHEN eg_id IS NOT NULL; + -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate. IF max_copy_count = 0 THEN SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs FROM actor.org_unit WHERE id IN (SELECT * FROM UNNEST(scope_orgs)) AND parent_ou IS NOT NULL; + EXIT WHEN CARDINALITY(scope_orgs) IS NULL; END IF; END LOOP; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql new file mode 100644 index 0000000000..79d729de87 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql @@ -0,0 +1,79 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$ +DECLARE + eg_id BIGINT; + match_count INT; + rec vandelay.bib_match%ROWTYPE; + v_owning_lib INT; + scope_org INT; + scope_orgs INT[]; + copy_count INT := 0; + max_copy_count INT := 0; +BEGIN + + PERFORM * FROM vandelay.queued_bib_record WHERE import_time IS NOT NULL AND id = import_id; + + IF FOUND THEN + -- RAISE NOTICE 'already imported, cannot auto-overlay' + RETURN FALSE; + END IF; + + -- Gather all the owning libs for our import items. + -- These are our initial scope_orgs. + SELECT ARRAY_AGG(DISTINCT owning_lib) INTO scope_orgs + FROM vandelay.import_item + WHERE record = import_id; + + WHILE CARDINALITY(scope_orgs) IS NOT NULL LOOP + EXIT WHEN CARDINALITY(scope_orgs) = 0; + FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP + -- For each match, get a count of all copies at descendants of our scope org. + FOR rec IN SELECT * FROM vandelay.bib_match AS vbm + WHERE queued_record = import_id + ORDER BY vbm.eg_record DESC + LOOP + SELECT COUNT(acp.id) INTO copy_count + FROM asset.copy AS acp + INNER JOIN asset.call_number AS acn + ON acp.call_number = acn.id + WHERE acn.owning_lib IN (SELECT id FROM + actor.org_unit_descendants(scope_org)) + AND acn.record = rec.eg_record + AND acp.deleted = FALSE; + IF copy_count > max_copy_count THEN + max_copy_count := copy_count; + eg_id := rec.eg_record; + END IF; + END LOOP; + END LOOP; + + EXIT WHEN eg_id IS NOT NULL; + + -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate. + IF max_copy_count = 0 THEN + SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs + FROM actor.org_unit + WHERE id IN (SELECT * FROM UNNEST(scope_orgs)) + AND parent_ou IS NOT NULL; + EXIT WHEN CARDINALITY(scope_orgs) IS NULL; + END IF; + END LOOP; + + IF eg_id IS NULL THEN + -- Could not determine best match via copy count + -- fall back to default best match + IF (SELECT * FROM vandelay.auto_overlay_bib_record_with_best( import_id, merge_profile_id, lwm_ratio_value_p )) THEN + RETURN TRUE; + ELSE + RETURN FALSE; + END IF; + END IF; + + RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id ); +END; +$$ LANGUAGE PLPGSQL; + +COMMIT; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/012.schema.vandelay.sql | 6 +++- .../live_t/lp1848375_marc_import_auto_overlay.pg | 33 ++++++++++++++++++++++ ...hema.vandelay.auto_overlay_org_unit_copies.sql} | 8 ++++-- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg copy Open-ILS/src/sql/Pg/upgrade/{1186.schema.fix_auto_overlay_org_unit_copies.sql => 1474.schema.vandelay.auto_overlay_org_unit_copies.sql} (91%) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 1997324a0167ef67848e29d8bc72cb132dedd78b
by Git User 19 Jun '25

19 Jun '25

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, rel_3_14 has been updated via 1997324a0167ef67848e29d8bc72cb132dedd78b (commit) via 7e0e48cacf1c0f0ddf3fe61d6371466fa8c3a738 (commit) via 21bd2cdf1ab5d99afddc0a3476ae24535ed188e3 (commit) from b364ba7de62d6d0ad562ff6a07c74170b62a937b (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 1997324a0167ef67848e29d8bc72cb132dedd78b Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 09:40:44 2025 -0700 LP#1848375: stamp upgrade script Signed-off-by: Jane Sandberg <sandbergja(a)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 0b22ef1a4d..e3f7bebb66 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,7 +92,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 ('1471', :eg_version); -- miker/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1474', :eg_version); -- jeffdavis/gmcharlt/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql similarity index 97% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql rename to Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql index 79d729de87..24bc1ed856 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1474.schema.vandelay.auto_overlay_org_unit_copies.sql @@ -1,6 +1,6 @@ BEGIN; -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1474', :eg_version); CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$ DECLARE commit 7e0e48cacf1c0f0ddf3fe61d6371466fa8c3a738 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 09:36:58 2025 -0700 LP#1848375: follow-up: add a pgtap test I wrote a test to help me wrap my mind around the infinite loop. I'm checking it in in case it helps others to understand the function or prevents regressions. Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg b/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg new file mode 100644 index 0000000000..af57928482 --- /dev/null +++ b/Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg @@ -0,0 +1,33 @@ +BEGIN; + +SELECT plan(1); + +-- The function under test previously had an infinite loop, which makes for a very +-- boring test-running experience. For this db session only, set a time limit of +-- 5 seconds. +SET statement_timeout = 5000; + +-- Create a queue +INSERT INTO vandelay.bib_queue (id, owner, name) VALUES (5555, 7, 'lp1848375 test bucket'); + +-- Enqueue a bib record and an item that matches a record in the collection +INSERT INTO vandelay.queued_bib_record(id, marc, queue) VALUES (7777, '<record><datafield tag="901" ind1=" " ind2=" "><subfield code="c">243</subfield></datafield></record>', 5555); +INSERT INTO vandelay.import_item (record, definition, owning_lib) VALUES ( + 7777, + 1, -- Evergreen holdings format + 9 -- Bookmobile 1, which already has some copies of bib record 243 +); + +PREPARE auto_overlay_with_items AS SELECT vandelay.auto_overlay_org_unit_copies( + 7777, + 2, -- full overlay + 0 -- quality ratio +); + +SELECT performs_ok( + 'auto_overlay_with_items', + 1000, + 'overlaying a record with items takes less than a second' +); + +ROLLBACK; commit 21bd2cdf1ab5d99afddc0a3476ae24535ed188e3 Author: Jeff Davis <jdavis(a)sitka.bclibraries.ca> Date: Wed Oct 16 12:29:25 2019 -0700 LP#1848375: finesse while loop on vandelay.auto_overlay_org_unit_copies Release-note: Fixes bug where MARC import with items might never finish when "Use Org Unit Matching in Copy to Determine Best Match" is in effect Signed-off-by: Jeff Davis <jdavis(a)sitka.bclibraries.ca> Signed-off-by: Galen Charlton <gmc(a)equinoxOLI.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql index 77423e8182..0d4818f9de 100644 --- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql +++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql @@ -1916,7 +1916,8 @@ BEGIN FROM vandelay.import_item WHERE record = import_id; - WHILE CARDINALITY(scope_orgs) > 0 LOOP + WHILE CARDINALITY(scope_orgs) IS NOT NULL LOOP + EXIT WHEN CARDINALITY(scope_orgs) = 0; FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP -- For each match, get a count of all copies at descendants of our scope org. FOR rec IN SELECT * FROM vandelay.bib_match AS vbm @@ -1938,12 +1939,15 @@ BEGIN END LOOP; END LOOP; + EXIT WHEN eg_id IS NOT NULL; + -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate. IF max_copy_count = 0 THEN SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs FROM actor.org_unit WHERE id IN (SELECT * FROM UNNEST(scope_orgs)) AND parent_ou IS NOT NULL; + EXIT WHEN CARDINALITY(scope_orgs) IS NULL; END IF; END LOOP; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql new file mode 100644 index 0000000000..79d729de87 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay.auto_overlay_org_unit_copies.sql @@ -0,0 +1,79 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +CREATE OR REPLACE FUNCTION vandelay.auto_overlay_org_unit_copies ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$ +DECLARE + eg_id BIGINT; + match_count INT; + rec vandelay.bib_match%ROWTYPE; + v_owning_lib INT; + scope_org INT; + scope_orgs INT[]; + copy_count INT := 0; + max_copy_count INT := 0; +BEGIN + + PERFORM * FROM vandelay.queued_bib_record WHERE import_time IS NOT NULL AND id = import_id; + + IF FOUND THEN + -- RAISE NOTICE 'already imported, cannot auto-overlay' + RETURN FALSE; + END IF; + + -- Gather all the owning libs for our import items. + -- These are our initial scope_orgs. + SELECT ARRAY_AGG(DISTINCT owning_lib) INTO scope_orgs + FROM vandelay.import_item + WHERE record = import_id; + + WHILE CARDINALITY(scope_orgs) IS NOT NULL LOOP + EXIT WHEN CARDINALITY(scope_orgs) = 0; + FOR scope_org IN SELECT * FROM UNNEST(scope_orgs) LOOP + -- For each match, get a count of all copies at descendants of our scope org. + FOR rec IN SELECT * FROM vandelay.bib_match AS vbm + WHERE queued_record = import_id + ORDER BY vbm.eg_record DESC + LOOP + SELECT COUNT(acp.id) INTO copy_count + FROM asset.copy AS acp + INNER JOIN asset.call_number AS acn + ON acp.call_number = acn.id + WHERE acn.owning_lib IN (SELECT id FROM + actor.org_unit_descendants(scope_org)) + AND acn.record = rec.eg_record + AND acp.deleted = FALSE; + IF copy_count > max_copy_count THEN + max_copy_count := copy_count; + eg_id := rec.eg_record; + END IF; + END LOOP; + END LOOP; + + EXIT WHEN eg_id IS NOT NULL; + + -- If no matching bibs had holdings, gather our next set of orgs to check, and iterate. + IF max_copy_count = 0 THEN + SELECT ARRAY_AGG(DISTINCT parent_ou) INTO scope_orgs + FROM actor.org_unit + WHERE id IN (SELECT * FROM UNNEST(scope_orgs)) + AND parent_ou IS NOT NULL; + EXIT WHEN CARDINALITY(scope_orgs) IS NULL; + END IF; + END LOOP; + + IF eg_id IS NULL THEN + -- Could not determine best match via copy count + -- fall back to default best match + IF (SELECT * FROM vandelay.auto_overlay_bib_record_with_best( import_id, merge_profile_id, lwm_ratio_value_p )) THEN + RETURN TRUE; + ELSE + RETURN FALSE; + END IF; + END IF; + + RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id ); +END; +$$ LANGUAGE PLPGSQL; + +COMMIT; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/012.schema.vandelay.sql | 6 +++- .../live_t/lp1848375_marc_import_auto_overlay.pg | 33 ++++++++++++++++++++++ ...hema.vandelay.auto_overlay_org_unit_copies.sql} | 8 ++++-- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/live_t/lp1848375_marc_import_auto_overlay.pg copy Open-ILS/src/sql/Pg/upgrade/{1186.schema.fix_auto_overlay_org_unit_copies.sql => 1474.schema.vandelay.auto_overlay_org_unit_copies.sql} (91%) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. d58439ece73259085a9f929da7d3529a45ab5837
by Git User 19 Jun '25

19 Jun '25

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, main has been updated via d58439ece73259085a9f929da7d3529a45ab5837 (commit) via 7c01e2c77ce61025cde0a76e973d63e23c9c3eb3 (commit) from 3bc427ad3132c9ddd67a314c8ee596a9ccd2570f (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 d58439ece73259085a9f929da7d3529a45ab5837 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Thu Jun 19 05:08:28 2025 -0700 LP1752367: stamp upgrade script Signed-off-by: Jane Sandberg <sandbergja(a)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 3b9b72b341..eba2c4a1b2 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,7 +92,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 ('1472', :eg_version); -- terranm/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1473', :eg_version); -- smayo/redavis/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor-stat-cat-entry-update.sql b/Open-ILS/src/sql/Pg/upgrade/1473.schema.actor-stat-cat-entry-update.sql similarity index 94% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor-stat-cat-entry-update.sql rename to Open-ILS/src/sql/Pg/upgrade/1473.schema.actor-stat-cat-entry-update.sql index f64bf465f8..c1ae7108eb 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor-stat-cat-entry-update.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1473.schema.actor-stat-cat-entry-update.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1473', :eg_version); -- Basically the same thing as using cascade update, but the stat_cat_entry isn't a foreign key as it can be freetext CREATE OR REPLACE FUNCTION actor.stat_cat_entry_usr_map_cascade_update() RETURNS TRIGGER AS $$ @@ -38,4 +38,4 @@ CREATE TRIGGER actor_stat_cat_entry_delete_trigger EXECUTE FUNCTION actor.stat_cat_entry_usr_map_cascade_delete(); -COMMIT; \ No newline at end of file +COMMIT; commit 7c01e2c77ce61025cde0a76e973d63e23c9c3eb3 Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Mon Jun 2 10:14:15 2025 -0400 lp1752367 Can't Edit and Delete Stat Cat Entries Reenables editing and deleting Stat Cat Entries in the web client. Adds a SQL trigger to update or delete actor.stat_cat_entry_usr_map as if the column had cascade update or delete, so long as the column exactly matches the changing actor.stat_cat_entry column. Added a pgtap test for the existence of the triggers and that they do the thing on updating or deleting stat_cat_entries. Release-note: Allow administrators to edit and delete statistical category entries. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts index 5c89569e9a..25ddf1457d 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts @@ -158,8 +158,6 @@ const routes: Routes = [{ orgFieldsDefaultingToContextOrg: 'owner', fieldOptions: {owner: {persistKey: 'admin.stat_cat.owner' } }, contextOrgSelectorPersistKey: 'admin.item_stat_cat.main_org_selector', - disableEdit: true, - disableDelete: true, recordLabel: $localize `Statistical Category Entry - Item`, hideClearFilters: true, fieldOrder: 'stat_cat,value,owner'}] @@ -189,8 +187,6 @@ const routes: Routes = [{ orgFieldsDefaultingToContextOrg: 'owner', fieldOptions: {owner: {persistKey: 'admin.stat_cat.owner' } }, contextOrgSelectorPersistKey: 'admin.patron_stat_cat.main_org_selector', - disableEdit: true, - disableDelete: true, recordLabel: $localize `Statistical Category Entry - Patron`, hideClearFilters: true, fieldOrder: 'stat_cat,value,owner'}] diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql index 5e68ae5ef3..a097395649 100644 --- a/Open-ILS/src/sql/Pg/005.schema.actors.sql +++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql @@ -281,6 +281,38 @@ $$; CREATE INDEX actor_stat_cat_entry_usr_idx ON actor.stat_cat_entry_usr_map (target_usr); +-- Basically the same thing as using cascade update, but the stat_cat_entry isn't a foreign key as it can be freetext +CREATE FUNCTION actor.stat_cat_entry_usr_map_cascade_update() RETURNS TRIGGER AS $$ +BEGIN + UPDATE actor.stat_cat_entry_usr_map + SET stat_cat_entry = NEW.value + WHERE stat_cat_entry = OLD.value + AND stat_cat = OLD.stat_cat; + + RETURN NEW; +END; +$$ LANGUAGE PLPGSQL; + +-- Basically the same thing as using cascade delete, but the stat_cat_entry isn't a foreign key as it can be freetext +CREATE OR REPLACE FUNCTION actor.stat_cat_entry_usr_map_cascade_delete() RETURNS TRIGGER AS $$ +BEGIN + DELETE FROM actor.stat_cat_entry_usr_map + WHERE stat_cat_entry = OLD.value + AND stat_cat = OLD.stat_cat; + + RETURN NEW; +END; +$$ LANGUAGE PLPGSQL; + +CREATE TRIGGER actor_stat_cat_entry_update_trigger + BEFORE UPDATE ON actor.stat_cat_entry FOR EACH ROW + EXECUTE FUNCTION actor.stat_cat_entry_usr_map_cascade_update(); + +CREATE TRIGGER actor_stat_cat_entry_delete_trigger + AFTER DELETE ON actor.stat_cat_entry FOR EACH ROW + EXECUTE FUNCTION actor.stat_cat_entry_usr_map_cascade_delete(); + + CREATE FUNCTION actor.stat_cat_check() RETURNS trigger AS $func$ DECLARE sipfield actor.stat_cat_sip_fields%ROWTYPE; diff --git a/Open-ILS/src/sql/Pg/t/lp1752367-patron_stat_cat_update_delete.pg b/Open-ILS/src/sql/Pg/t/lp1752367-patron_stat_cat_update_delete.pg new file mode 100644 index 0000000000..f250e80e6d --- /dev/null +++ b/Open-ILS/src/sql/Pg/t/lp1752367-patron_stat_cat_update_delete.pg @@ -0,0 +1,86 @@ +BEGIN; + +SELECT plan(10); + +--Make sure our triggers exist +SELECT has_trigger('actor', 'stat_cat_entry', 'actor_stat_cat_entry_update_trigger', 'Has stat_cat_entry update trigger'); +SELECT has_trigger('actor', 'stat_cat_entry', 'actor_stat_cat_entry_delete_trigger', 'Has stat_cat_entry delete trigger'); + +-- Create a test patron +INSERT INTO actor.usr (usrname, first_given_name, family_name, profile, passwd, ident_type, home_ou) +VALUES ('douglasdouglas', 'douglas', 'douglasson', 42, 'hunter2', 1, 4); +-- Did the test patron create? +SELECT isnt_empty( + 'SELECT profile FROM actor.usr WHERE usrname = ''douglasdouglas'' ' , + 'Can create a patron' +); + +SELECT id INTO TEMP TABLE tu +FROM actor.usr +WHERE usrname = 'douglasdouglas'; + +-- Create a test stat cat +INSERT INTO actor.stat_cat (owner, name) +VALUES ('4', 'pgTap stat_cat'); +-- Did the stat cat create? +SELECT isnt_empty( + 'SELECT * FROM actor.stat_cat WHERE name = ''pgTap stat_cat''', + 'Can create a patron stat cat' +); + +-- Remember the id of the stat cat we just made for later +SELECT sc.id AS stat_cat_id INTO TEMP TABLE sc +FROM actor.stat_cat sc WHERE name = 'pgTap stat_cat'; + +-- Create some test stat_cat_entries +INSERT INTO actor.stat_cat_entry (stat_cat, owner, value) +SELECT tv.stat_cat_id, v.owner, v.value +FROM sc tv, +(VALUES + (1, 'Beef'), + (1, 'Borf'), + (1, 'Boeuf') +) AS v (owner, value); +-- Did the stat_cat_entries create? +SELECT results_eq ( + 'SELECT value FROM actor.stat_cat_entry WHERE owner = 1 ORDER BY value ASC', + ARRAY['Beef', 'Boeuf', 'Borf'], + 'Can add 3 stat_cat_entries' +); + +--Make sure adding a duplicate entry fails +SELECT throws_ok( + 'INSERT INTO actor.stat_cat_entry (stat_cat, owner, value) + SELECT tv.stat_cat_id, 1, ''Beef'' + FROM sc tv', + 23505, + 'duplicate key value violates unique constraint "sce_once_per_owner"', + 'Can''t add duplicate stat cat entry' +); + +--Give our new patron the one of the stat_cat_entry +INSERT INTO actor.stat_cat_entry_usr_map (stat_cat, target_usr, stat_cat_entry) +SELECT sc.stat_cat_id, tu.id, 'Beef' +FROM sc, tu; +--Make sure we added the stat_cat_entry +PREPARE find_douglas_stat_cat_entry (text) AS ( + SELECT stat_cat_entry + FROM actor.stat_cat_entry_usr_map + WHERE stat_cat_entry = $1 +); +SELECT isnt_empty('find_douglas_stat_cat_entry(''Beef'')', 'Can add the stat_cat_entry to our patron') FROM tu LIMIT 1; + +-- Make sure douglasdouglas updates when we change the stat_cat_entry +UPDATE actor.stat_cat_entry +SET value = 'Bouf' +WHERE value = 'Beef'; +SELECT is_empty('find_douglas_stat_cat_entry(''Beef'')', 'stat_cat_entry_usr_map is no longer old value on update'); +SELECT isnt_empty('find_douglas_stat_cat_entry(''Bouf'')', 'stat_cat_entry_usr_map is now new value on update'); + +--Make sure douglasdouglas has nothing when we remove the stat_cat_entry +DELETE FROM actor.stat_cat_entry +WHERE value = 'Bouf'; +SELECT is_empty('find_douglas_stat_cat_entry(''Bouf'')', 'stat_cat_entry_usr_map is gone on delete'); + +SELECT * FROM finish(); +ROLLBACK; \ No newline at end of file diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor-stat-cat-entry-update.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor-stat-cat-entry-update.sql new file mode 100644 index 0000000000..f64bf465f8 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor-stat-cat-entry-update.sql @@ -0,0 +1,41 @@ +BEGIN; + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +-- Basically the same thing as using cascade update, but the stat_cat_entry isn't a foreign key as it can be freetext +CREATE OR REPLACE FUNCTION actor.stat_cat_entry_usr_map_cascade_update() RETURNS TRIGGER AS $$ +BEGIN + UPDATE actor.stat_cat_entry_usr_map + SET stat_cat_entry = NEW.value + WHERE stat_cat_entry = OLD.value + AND stat_cat = OLD.stat_cat; + + RETURN NEW; +END; +$$ LANGUAGE PLPGSQL; + + +DROP TRIGGER IF EXISTS actor_stat_cat_entry_update_trigger ON actor.stat_cat_entry; +CREATE TRIGGER actor_stat_cat_entry_update_trigger + BEFORE UPDATE ON actor.stat_cat_entry FOR EACH ROW + EXECUTE FUNCTION actor.stat_cat_entry_usr_map_cascade_update(); + + +-- Basically the same thing as using cascade delete, but the stat_cat_entry isn't a foreign key as it can be freetext +CREATE OR REPLACE FUNCTION actor.stat_cat_entry_usr_map_cascade_delete() RETURNS TRIGGER AS $$ +BEGIN + DELETE FROM actor.stat_cat_entry_usr_map + WHERE stat_cat_entry = OLD.value + AND stat_cat = OLD.stat_cat; + + RETURN NEW; +END; +$$ LANGUAGE PLPGSQL; + +DROP TRIGGER IF EXISTS actor_stat_cat_entry_delete_trigger ON actor.stat_cat_entry; +CREATE TRIGGER actor_stat_cat_entry_delete_trigger + AFTER DELETE ON actor.stat_cat_entry FOR EACH ROW + EXECUTE FUNCTION actor.stat_cat_entry_usr_map_cascade_delete(); + + +COMMIT; \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/admin/local/routing.module.ts | 4 - Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/005.schema.actors.sql | 32 ++++++++ .../t/lp1752367-patron_stat_cat_update_delete.pg | 86 ++++++++++++++++++++++ .../1473.schema.actor-stat-cat-entry-update.sql | 41 +++++++++++ 5 files changed, 160 insertions(+), 5 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/t/lp1752367-patron_stat_cat_update_delete.pg create mode 100644 Open-ILS/src/sql/Pg/upgrade/1473.schema.actor-stat-cat-entry-update.sql hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 8bcb669c4793774ed278470e897741a92e381a50
by Git User 18 Jun '25

18 Jun '25

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, rel_3_15 has been updated via 8bcb669c4793774ed278470e897741a92e381a50 (commit) from d38f7262a47bbbbb5ce08f94b999c15168281356 (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 8bcb669c4793774ed278470e897741a92e381a50 Author: Jason Stephenson <jason(a)sigio.com> Date: Wed Jun 18 19:27:27 2025 -0400 Forward port 3.15.1 to 3.15.2 db upgrade script Signed-off-by: Jason Stephenson <jason(a)sigio.com> diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.15.1-3.15.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.15.1-3.15.2-upgrade-db.sql new file mode 100644 index 0000000000..ed0c2b7b80 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.15.1-3.15.2-upgrade-db.sql @@ -0,0 +1,39 @@ +--Upgrade Script for 3.15.1 to 3.15.2 +\set eg_version '''3.15.2''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.15.2', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('1471', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.oils_xpath_string(text, text, text, anyarray) RETURNS text +AS $F$ + SELECT ARRAY_TO_STRING( + oils_xpath( + $1 || + CASE WHEN $1 ~ $re$/[^/[]*@[^]]+$$re$ OR $1 ~ $re$\)$$re$ THEN '' ELSE '//text()' END, + $2, + $4 + ), + $3 + ); +$F$ LANGUAGE SQL IMMUTABLE; + + + +SELECT evergreen.upgrade_deps_block_check('1472', :eg_version); + +INSERT into config.workstation_setting_type (name, grp, datatype, label) +VALUES ( + 'eg.grid.admin.config.coded_value_map', 'gui', 'object', + oils_i18n_gettext( + 'eg.grid.admin.config.coded_value_map', + 'Grid Config: eg.grid.admin.config.coded_value_map', + 'cwst', 'label' + ) +); + +COMMIT; + +-- Update auditor tables to catch changes to source tables. +-- Can be removed/skipped if there were no schema changes. +SELECT auditor.update_auditors(); ----------------------------------------------------------------------- Summary of changes: ....7-upgrade-db.sql => 3.15.1-3.15.2-upgrade-db.sql} | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) copy Open-ILS/src/sql/Pg/version-upgrade/{3.14.6-3.14.7-upgrade-db.sql => 3.15.1-3.15.2-upgrade-db.sql} (61%) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 3bc427ad3132c9ddd67a314c8ee596a9ccd2570f
by Git User 18 Jun '25

18 Jun '25

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, main has been updated via 3bc427ad3132c9ddd67a314c8ee596a9ccd2570f (commit) from aee5289e4334e678cc9649aa0cb51eecc9a51641 (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 3bc427ad3132c9ddd67a314c8ee596a9ccd2570f Author: Jason Stephenson <jason(a)sigio.com> Date: Wed Jun 18 19:27:27 2025 -0400 Forward port 3.15.1 to 3.15.2 db upgrade script Signed-off-by: Jason Stephenson <jason(a)sigio.com> diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.15.1-3.15.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.15.1-3.15.2-upgrade-db.sql new file mode 100644 index 0000000000..ed0c2b7b80 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.15.1-3.15.2-upgrade-db.sql @@ -0,0 +1,39 @@ +--Upgrade Script for 3.15.1 to 3.15.2 +\set eg_version '''3.15.2''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.15.2', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('1471', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.oils_xpath_string(text, text, text, anyarray) RETURNS text +AS $F$ + SELECT ARRAY_TO_STRING( + oils_xpath( + $1 || + CASE WHEN $1 ~ $re$/[^/[]*@[^]]+$$re$ OR $1 ~ $re$\)$$re$ THEN '' ELSE '//text()' END, + $2, + $4 + ), + $3 + ); +$F$ LANGUAGE SQL IMMUTABLE; + + + +SELECT evergreen.upgrade_deps_block_check('1472', :eg_version); + +INSERT into config.workstation_setting_type (name, grp, datatype, label) +VALUES ( + 'eg.grid.admin.config.coded_value_map', 'gui', 'object', + oils_i18n_gettext( + 'eg.grid.admin.config.coded_value_map', + 'Grid Config: eg.grid.admin.config.coded_value_map', + 'cwst', 'label' + ) +); + +COMMIT; + +-- Update auditor tables to catch changes to source tables. +-- Can be removed/skipped if there were no schema changes. +SELECT auditor.update_auditors(); ----------------------------------------------------------------------- Summary of changes: ....7-upgrade-db.sql => 3.15.1-3.15.2-upgrade-db.sql} | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) copy Open-ILS/src/sql/Pg/version-upgrade/{3.14.6-3.14.7-upgrade-db.sql => 3.15.1-3.15.2-upgrade-db.sql} (61%) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch tags/rel_3_14_7 created. cbade387909eb2fc3b44c6596c6ebfaf9a32b614
by Git User 18 Jun '25

18 Jun '25

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, tags/rel_3_14_7 has been created at cbade387909eb2fc3b44c6596c6ebfaf9a32b614 (commit) - Log ----------------------------------------------------------------- commit cbade387909eb2fc3b44c6596c6ebfaf9a32b614 Author: Jane Sandberg <js7389(a)princeton.edu> Date: Tue Jun 17 17:26:52 2025 -0500 Bumping version numbers and adding Upgrade Script Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm index d7235ce61a..e849d8e921 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS.pm @@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system =cut -our $VERSION = '2.4'; +our $VERSION = '3.1407'; 1; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 1c09bee84b..f31b88defa 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -26,7 +26,7 @@ sub use_authoritative { sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "HEAD"; + return "3-14-7"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 0b22ef1a4d..012be9a1e3 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -93,6 +93,7 @@ CREATE TRIGGER no_overlapping_deps FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1471', :eg_version); -- miker/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.14.7', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.14.6-3.14.7-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.14.6-3.14.7-upgrade-db.sql new file mode 100644 index 0000000000..06bdd9802b --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.14.6-3.14.7-upgrade-db.sql @@ -0,0 +1,26 @@ +--Upgrade Script for 3.14.6 to 3.14.7 +\set eg_version '''3.14.7''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.14.7', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('1471', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.oils_xpath_string(text, text, text, anyarray) RETURNS text +AS $F$ + SELECT ARRAY_TO_STRING( + oils_xpath( + $1 || + CASE WHEN $1 ~ $re$/[^/[]*@[^]]+$$re$ OR $1 ~ $re$\)$$re$ THEN '' ELSE '//text()' END, + $2, + $4 + ), + $3 + ); +$F$ LANGUAGE SQL IMMUTABLE; + + +COMMIT; + +-- Update auditor tables to catch changes to source tables. +-- Can be removed/skipped if there were no schema changes. +SELECT auditor.update_auditors(); diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index b2b87b683f..ed2ef61223 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@ <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));"> <h1 style="text-decoration: underline">Evergreen</h1> <p>Target Server ID: <span id="version"></span></p> -<p>$HeadURL$</p> +<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/…</p> <h2>What is Evergreen?</h2> <blockquote> <p> diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 0613a13ddf..bef24e872f 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/…"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/README b/README deleted file mode 120000 index 1486a8d676..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/modules/installation/pages/server_installation.adoc \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000000..f646356428 --- /dev/null +++ b/README @@ -0,0 +1,803 @@ += Installing the Evergreen server = +:toc: + +== Preamble: referenced user accounts == + +In subsequent sections, we will refer to a number of different accounts, as +follows: + + * Linux user accounts: + ** The *user* Linux account is the account that you use to log onto the + Linux system as a regular user. + ** The *root* Linux account is an account that has system administrator + privileges. On Debian you can switch to this account from + your *user* account by issuing the `su -` command and entering the + password for the *root* account when prompted. On Ubuntu you can switch + to this account from your *user* account using the `sudo su -` command + and entering the password for your *user* account when prompted. + ** The *opensrf* Linux account is an account that you create when installing + OpenSRF. You can switch to this account from the *root* account by + issuing the `su - opensrf` command. + ** The *postgres* Linux account is created automatically when you install + the PostgreSQL database server. You can switch to this account from the + *root* account by issuing the `su - postgres` command. + * PostgreSQL user accounts: + ** The *evergreen* PostgreSQL account is a superuser account that you will + create to connect to the PostgreSQL database server. + * Evergreen administrator account: + ** The *egadmin* Evergreen account is an administrator account for + Evergreen that you will use to test connectivity and configure your + Evergreen instance. + +== Preamble: developer instructions == + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/egdownloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must perform one step before they +can proceed with the `./configure` step. + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +== Installing prerequisites == + + * **PostgreSQL**: The minimum supported version is 13. + * **Linux**: Evergreen has been tested on + Debian Bookworm (12), + Debian Bullseye (11), + Debian Buster (10), + Ubuntu Noble Numbat (24.04), + and Ubuntu Jammy Jellyfish (22.04). + If you are running an older version of these distributions, you may want + to upgrade before upgrading Evergreen. For instructions on upgrading these + distributions, visit the Debian or Ubuntu websites. + * **OpenSRF**: The minimum supported version of OpenSRF is 3.3.0. + + +Evergreen has a number of prerequisite packages that must be installed +before you can successfully configure, compile, and install Evergreen. + +1. Begin by installing the most recent version of OpenSRF (3.3.0 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/ ++ +2. Issue the following commands as the *root* Linux account to install + prerequisites using the `Makefile.install` prerequisite installer, + substituting `debian-bookworm`,`debian-bullseye`,`debian-buster`,`ubuntu-jammy`, + or `ubuntu-noble` for <osname> below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install <osname> +------------------------------------------------------------------------------ ++ +[[optional_developer_additions]] +3. OPTIONAL: Developer additions ++ +To perform certain developer tasks from a Git source code checkout, +additional packages are required. As the *root* Linux account: ++ + * To install packages needed for retrieving and managing web dependencies, + use the <osname>-developer Makefile.install target. Currently, + this is only needed for building and installing the web + staff client. + * To optionally run Angular and AngularJS tests you will need to manually + install Firefox and your choice of Chromium or Chrome. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install <osname>-developer +------------------------------------------------------------------------------ ++ + * To install packages required for building Evergreen translations, use + the <osname>-translator Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install <osname>-translator +------------------------------------------------------------------------------ ++ + * To install packages required for building Evergreen release bundles, use + the <osname>-packager Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install <osname>-packager +------------------------------------------------------------------------------ + +== Extra steps for web staff client == + +[NOTE] +Skip this entire section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads. Otherwise, ensure you have installed the +xref:#optional_developer_additions[optional developer additions] before proceeding. + +[[install_files_for_web_staff_client]] +=== Install AngularJS files for web staff client === + +1. Building, Testing, Minification: The remaining steps all take place within + the staff JS web root: ++ +[source,sh] +------------------------------------------------------------------------------ +cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/ +------------------------------------------------------------------------------ ++ +2. Install Project-local Dependencies. npm inspects the 'package.json' file + for dependencies and fetches them from the Node package network. ++ +[source,sh] +------------------------------------------------------------------------------ +npm ci # fetch JS dependencies +------------------------------------------------------------------------------ ++ +3. Run the build script. ++ +[source,sh] +------------------------------------------------------------------------------ +npm run build-prod +------------------------------------------------------------------------------ ++ +4. OPTIONAL: Test web client code if the <osname>-developer packages and + the necessary browsers are installed. + CHROME_BIN should be set to the path to chrome or chromimum, e.g., + `/usr/bin/chromium`: ++ +[source,sh] +------------------------------------------------------------------------------ +CHROME_BIN=/path/to/chrome npm run test +------------------------------------------------------------------------------ + +[[install_files_for_angular_web_staff_client]] +=== Install Angular files for web staff client === + +1. Building, Testing, Minification: The remaining steps all take place within + the Angular staff root: ++ +[source,sh] +------------------------------------------------------------------------------ +cd $EVERGREEN_ROOT/Open-ILS/src/eg2/ +------------------------------------------------------------------------------ ++ +2. Install Project-local Dependencies. npm inspects the 'package.json' file + for dependencies and fetches them from the Node package network. ++ +[source,sh] +------------------------------------------------------------------------------ +npm ci # fetch JS dependencies +------------------------------------------------------------------------------ ++ +3. Run the build script. ++ +[source,sh] +------------------------------------------------------------------------------ +ng build --configuration=production +------------------------------------------------------------------------------ ++ +This can be a memory-intensive build. If the process does not finish, and you +get the message "Killed" in the console, try running it with +https://nodejs.org/api/cli.html#cli_max_old_space_size_size_in_megabytes[an explicit max-old-space-size option] +to encourage more garbage collection. For example, on a machine with 4GB of +memory, you can limit max-old-space-size to 3GB with: ++ +[source,sh] +------------------------------------------------------------------------------ +NODE_OPTIONS=--max-old-space-size=3072 ng build --configuration=production +------------------------------------------------------------------------------ ++ +4. OPTIONAL: Test eg2 web client code if the <osname>-developer packages and + the necessary browsers are installed: + CHROME_BIN should be set to the path to chrome or chromimum, e.g., + `/usr/bin/chromium`: ++ +[source,sh] +------------------------------------------------------------------------------ +CHROME_BIN=/path/to/chrome npm run test +MOZ_HEADLESS=1 ng e2e +------------------------------------------------------------------------------ + +[[install_opac_deps]] +=== Install OPAC skin dependencies === + +1. The following steps take place within the OPAC dependencies root: ++ +[source,sh] +------------------------------------------------------------------------------ +cd $EVERGREEN_ROOT/Open-ILS/web/opac/deps +------------------------------------------------------------------------------ ++ +2. Install Project-local Dependencies. npm inspects the 'package.json' file + for dependencies and fetches them from the Node package network. ++ +[source,sh] +------------------------------------------------------------------------------ +npm ci # fetch JS and CSS dependencies +------------------------------------------------------------------------------ ++ +Note that there is no build step. + +3. OPTIONAL: Test OPAC javascript code: ++ +[source,sh] +------------------------------------------------------------------------------ +npm run test +------------------------------------------------------------------------------ + + +== Configuration and compilation instructions == + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +These instructions assume that you have also installed OpenSRF under `/openils/`. +If not, please adjust PATH as needed so that the Evergreen `configure` script +can find `osrf_config`. + +== Installation instructions == + +1. Once you have configured and compiled Evergreen, issue the following + command as the *root* Linux account to install Evergreen and copy + example configuration files to `/openils/conf`. ++ +[source, bash] +------------------------------------------------------------------------------ +make install +------------------------------------------------------------------------------ + +== Change ownership of the Evergreen files == + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +== Run ldconfig == + +On Ubuntu or Debian, run the following command as the root user: + +[source, bash] +------------------------------------------------------------------------------ +ldconfig +------------------------------------------------------------------------------ + +== Additional Instructions for Developers == + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/egdownloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, need to install the Dojo Toolkit +set of JavaScript libraries. The appropriate version of Dojo is included in +Evergreen release tarballs. Developers should install the Dojo 1.3.3 version +of Dojo by issuing the following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +wget https://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz +tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz +cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/. +------------------------------------------------------------------------------ + + +== Configure the Apache Web server == + +. Use the example configuration files to configure your Web server for +the Evergreen catalog, web staff client, Web services, and administration +interfaces. Issue the following commands as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------------ +cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf +cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf +cp Open-ILS/examples/apache_24/eg_startup /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------------ ++ +. The `openssl` command cuts a new SSL key for your Apache server. For a +production server, you should purchase a signed SSL certificate, but you can +just use a self-signed certificate and accept the warnings in the +and browser during testing and development. Create an SSL key for the Apache +server by issuing the following command as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------ +openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key +------------------------------------------------------------------------------ ++ +. As the *root* Linux account, edit the `eg.conf` file that you copied into +place. + a. To enable access to the offline upload / execute interface from any + workstation on any network, make the following change (and note that + you *must* secure this for a production instance): + * Replace `Require host 10.0.0.0/8` with `Require all granted` +. Change the user for the Apache server. + * As the *root* Linux account, edit + `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to + `export APACHE_RUN_USER=opensrf`. +. As the *root* Linux account, configure Apache with KeepAlive settings + appropriate for Evergreen. Higher values can improve the performance of a + single client by allowing multiple requests to be sent over the same TCP + connection, but increase the risk of using up all available Apache child + processes and memory. + * Edit `/etc/apache2/apache2.conf`. + a. Change `KeepAliveTimeout` to `1`. + b. Change `MaxKeepAliveRequests` to `100`. +. As the *root* Linux account, configure the prefork module to start and keep + enough Apache servers available to provide quick responses to clients without + running out of memory. The following settings are a good starting point for a + site that exposes the default Evergreen catalog to the web: ++ +.`/etc/apache2/mods-available/mpm_prefork.conf` +[source,bash] +------------------------------------------------------------------------------ +<IfModule mpm_prefork_module> + StartServers 15 + MinSpareServers 5 + MaxSpareServers 15 + MaxRequestWorkers 75 + MaxConnectionsPerChild 500 +</IfModule> +------------------------------------------------------------------------------ ++ +. As the *root* user, enable the mpm_prefork module: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dismod mpm_event +a2enmod mpm_prefork +------------------------------------------------------------------------------ ++ +. As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ ++ +. As the *root* Linux account, enable Apache to write + to the lock directory; this is currently necessary because Apache + is running as the `opensrf` user: ++ +[source,bash] +------------------------------------------------------------------------------ +chown opensrf /var/lock/apache2 +------------------------------------------------------------------------------ + +Learn more about additional Apache options in the following sections: + + * xref:admin:apache_rewrite_tricks.adoc#apache_rewrite_tricks[Apache Rewrite Tricks] + * xref:admin:apache_access_handler.adoc#apache_access_handler_perl_module[Apache Access Handler Perl Module] + +== Configure OpenSRF for the Evergreen application == + +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +=== OPTIONAL: Configure Evergreen for OpenSRF+Redis + +If using the Redis variant of OpenSRF, modify /openils/conf/opensrf_core.xml +to use the Redis settings instead of the Ejabberd settings. + +Several sections of the file have 2 configuration blocks, one for Ejabberd +and one for Redis. Example: + +[source,xml] +------------------------------------------------------------------------------ + +<passwd>password</passwd> +<port>5222</port> + + + + + +------------------------------------------------------------------------------ + +For each occurrence of such block, commente out the Ejabberd sections +and un-comment the Redis sections. Example: + +[source,xml] +------------------------------------------------------------------------------ + + + + + +<passwd>456fc340-beba-4489-9070-0d6b49e9952b</passwd> +<port>6379</port> + +------------------------------------------------------------------------------ + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config`, described in xref:#creating_the_evergreen_database[Creating the Evergreen database], sets the database connection information in `opensrf.xml` for you. + +=== Configure action triggers for the Evergreen application === +_Action Triggers_ provide hooks for the system to perform actions when a given +event occurs; for example, to generate reminder or overdue notices, the +`checkout.due` hook is processed and events are triggered for potential actions +if there is no checkin time. + +To enable the default set of hooks, issue the following command as the +*opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json +------------------------------------------------------------------------------ + +For more information about configuring and running action triggers, see +xref:admin:actiontriggers.adoc#processing_action_triggers[Notifications / Action Triggers]. + +[[creating_the_evergreen_database]] +== Creating the Evergreen database == + +=== Setting up the PostgreSQL server === + +For production use, most libraries install the PostgreSQL database server on a +dedicated machine. Therefore, by default, the `Makefile.install` prerequisite +installer does *not* install the PostgreSQL database server that is required +by every Evergreen system. You can install the packages required by Debian or +Ubuntu on the machine of your choice using the following commands as the +*root* Linux account: + +.Installing PostgreSQL server packages + +Each OS build target provides the postgres server installation +packages required for each operating system. To install Postgres +server packages, use the make target +'postgres-server-<OSTYPE>-<POSTGRESVERSION>'. Choose the most +appropriate command below based on your operating system and desired +PostgreSQL Version. + +To install PostgreSQL version 13, use the following command for your operating +system: + +[WARNING] +========= +PostgreSQL 12+ includes a feature called "JIT" (Just-in-Time compilation). +Do not turn on Postgres' JIT capabilities. Evergreen's queries, especially complex +ones used for search, are intentionally tuned for non-JIT execution and JIT has +been shown to be harmful in some circumstances. +Recommended minimum tweak to postgresql.conf: +jit_above_cost = -1 +========= + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bookworm-13 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bullseye-13 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-buster-13 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-jammy-13 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-noble-13 +------------------------------------------------------------------------------ + +To install PostgreSQL version 14, use the following command for your operating +system: + +[WARNING] +========= +PostgreSQL 12+ includes a feature called "JIT" (Just-in-Time compilation). +Do not turn on Postgres' JIT capabilities. Evergreen's queries, especially complex +ones used for search, are intentionally tuned for non-JIT execution and JIT has +been shown to be harmful in some circumstances. +Recommended minimum tweak to postgresql.conf: +jit_above_cost = -1 +========= + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bookworm-14 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bullseye-14 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-buster-14 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-jammy-14 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-noble-14 +------------------------------------------------------------------------------ + +To install PostgreSQL version 15, use the following command for your operating +system: + +[WARNING] +========= +PostgreSQL 12+ includes a feature called "JIT" (Just-in-Time compilation). +Do not turn on Postgres' JIT capabilities. Evergreen's queries, especially complex +ones used for search, are intentionally tuned for non-JIT execution and JIT has +been shown to be harmful in some circumstances. +Recommended minimum tweak to postgresql.conf: +jit_above_cost = -1 +========= + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bookworm-15 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bullseye-15 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-buster-15 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-jammy-15 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-noble-15 +------------------------------------------------------------------------------ + +To install PostgreSQL version 16, use the following command for your operating +system: + +[WARNING] +========= +PostgreSQL 12+ includes a feature called "JIT" (Just-in-Time compilation). +Do not turn on Postgres' JIT capabilities. Evergreen's queries, especially complex +ones used for search, are intentionally tuned for non-JIT execution and JIT has +been shown to be harmful in some circumstances. +Recommended minimum tweak to postgresql.conf: +jit_above_cost = -1 +========= + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bookworm-16 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-bullseye-16 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-buster-16 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-jammy-16 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-noble-16 +------------------------------------------------------------------------------ + +.Create the Evergreen PostgreSQL user + +You need to create a PostgreSQL superuser to create and access the database. +Issue the following command as the *postgres* Linux account to create a new +PostgreSQL superuser named `evergreen`. When prompted, enter the new user's +password: + +[source, bash] +------------------------------------------------------------------------------ +createuser -s -P evergreen +------------------------------------------------------------------------------ + +.Enabling connections to the PostgreSQL database + +Your PostgreSQL database may be configured by default to prevent connections, +for example, it might reject attempts to connect via TCP/IP or from other +servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf` +file, found in the `/etc/postgresql/` directory on Debian and Ubuntu. +A simple way to enable TCP/IP +connections from localhost to all databases with password authentication, which +would be suitable for a test install of Evergreen on a single server, is to +ensure the file contains the following entries _before_ any "host ... ident" +entries: + +------------------------------------------------------------------------------ +host all all ::1/128 md5 +host all all 127.0.0.1/32 md5 +------------------------------------------------------------------------------ + +When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to +make the changes take effect. For more information on configuring connectivity +to PostgreSQL, see +http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html + +=== Creating the Evergreen database and schema === + +Once you have created the *evergreen* PostgreSQL account, you also need to +create the database and schema, and configure your configuration files to point +at the database server. Issue the following command as the *root* Linux account +from inside the Evergreen source directory, replacing <user>, <password>, +<hostname>, <port>, and <dbname> with the appropriate values for your +PostgreSQL database (where <user> and <password> are for the *evergreen* +PostgreSQL account you just created), and replace <admin-user> and <admin-pass> +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config --update-config \ + --service all --create-database --create-schema --create-offline \ + --user <user> --password <password> --hostname <hostname> --port <port> \ + --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass> +------------------------------------------------------------------------------ + +This creates the database and schema and configures all of the services in +your `/openils/conf/opensrf.xml` configuration file to point to that database. +It also creates the configuration files required by the Evergreen `cgi-bin` +administration scripts, and sets the user name and password for the *egadmin* +Evergreen administrator account to your requested values. + +You can get a complete set of options for `eg_db_config` by passing the +`--help` parameter. + +=== Loading sample data === + +If you add the `--load-all-sample` parameter to the `eg_db_config` command, +a set of authority and bibliographic records, call numbers, copies, staff +and regular users, and transactions will be loaded into your target +database. This sample dataset is commonly referred to as the _concerto_ +sample data, and can be useful for testing out Evergreen functionality and +for creating problem reports that developers can easily recreate with their +own copy of the _concerto_ sample data. + +If you don't mind waiting a little longer, you can install the _enhanced_ +concerto dataset. Use this flag: `--load-concerto-enhanced`. This includes +all of the data from _concerto_. Notable differences include: + +. The organization units have friendly names +. Acquisitions data +. More billing scenarios +. More shelving locations and shelving location settings +. Authority data +. Japanese, Spanish, French and Czech bib records +. Metarecord holds +. Item Stat Cats +. Bookings data +. Pre-created OPAC carousels +. Serials data + + +=== Creating the database on a remote server === + +In a production instance of Evergreen, your PostgreSQL server should be +installed on a dedicated server. + +To create the database instance on a remote database server, simply +use the `--create-database` flag on `eg_db_config`. + +== Starting Evergreen == + +1. As the *root* Linux account, start the `memcached` and `ejabberd` services +(if they aren't already running): ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/ejabberd start +/etc/init.d/memcached start +------------------------------------------------------------------------------ ++ +2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the +following command is only necessary if you want to force Evergreen to treat the +hostname as `localhost`; if you configured `opensrf.xml` using the real +hostname of your machine as returned by `perl -ENet::Domain 'print +Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag. ++ +[source, bash] +------------------------------------------------------------------------------ +osrf_control -l --start-all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_control: command not found`, + then your environment variable `PATH` does not include the `/openils/bin` + directory; this should have been set in the *opensrf* Linux account's + `.bashrc` configuration file. To manually set the `PATH` variable, edit the + configuration file `~/.bashrc` as the *opensrf* Linux account and add the + following line: ++ +[source, bash] +------------------------------------------------------------------------------ +export PATH=$PATH:/openils/bin +------------------------------------------------------------------------------ ++ +3. As the *opensrf* Linux account, generate the Web files needed by the web staff + client and catalog and update the organization unit proximity (you need to do + this the first time you start Evergreen, and after that each time you change the library org unit configuration. +): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh +------------------------------------------------------------------------------ ++ +4. As the *root* Linux account, restart the Apache Web server: ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/apache2 restart +------------------------------------------------------------------------------ ++ +If the Apache Web server was running when you started the OpenSRF services, you +might not be able to successfully log in to the OPAC or web staff client until the +Apache Web server is restarted. + +== Testing connections to Evergreen == + +Once you have installed and started Evergreen, test your connection to +Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following +commands to start `srfsh` and try to log onto the Evergreen server using the +*egadmin* Evergreen administrator user name and password that you set using the +`eg_db_config` command: + +[source, bash] +------------------------------------------------------------------------------ +/openils/bin/srfsh +srfsh% login <admin-user> <admin-pass> +------------------------------------------------------------------------------ + +You should see a result like: + + Received Data: "250bf1518c7527a03249858687714376" + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 0.045286 + ------------------------------------ + + Received Data: { + "ilsevent":0, + "textcode":"SUCCESS", + "desc":" ", + "pid":21616, + "stacktrace":"oils_auth.c:304", + "payload":{ + "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a", + "authtime":420 + } + + } + + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 1.336568 + ------------------------------------ +[[install-troubleshooting-1]] +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux account, run the `settings-tester.pl` script to see + if it finds any system configuration problems. The script is found at + `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source + tree. + * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_… guide]. + * If you have faithfully followed the entire set of installation steps + listed here, you are probably extremely close to a working system. + Gather your configuration files and log files and contact the + http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development +mailing list] for assistance before making any drastic changes to your system + configuration. + +== Getting help == + +Need help installing or using Evergreen? Join the mailing lists at +http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode +IRC network on the #evergreen channel. + +== License == + +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 +Unported License. To view a copy of this license, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. diff --git a/configure.ac b/configure.ac index 71b8075f20..0a59155c86 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev(a)list.georgialibraries.org) +AC_INIT(Open-ILS, 3.14.7, open-ils-dev(a)list.georgialibraries.org) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/docs/modules/installation/pages/server_upgrade.adoc b/docs/modules/installation/pages/server_upgrade.adoc index 7da6fe22fb..1ed773865f 100644 --- a/docs/modules/installation/pages/server_upgrade.adoc +++ b/docs/modules/installation/pages/server_upgrade.adoc @@ -7,7 +7,7 @@ All of the steps in this chapter are to be completed from the command line. == Software Prerequisites == * **PostgreSQL**: The minimum supported version is 13. - * **Linux**: Evergreen 3.X.X has been tested on Debian Buster + * **Linux**: Evergreen 3.14.7 has been tested on Debian Buster (10.0), Debian Bullseye (11.0), Debian Bookworm (11.0), Ubuntu Jammy Jellyfish (22.04), and Ubuntu Noble Numbat (24.04). If you are running an older version of these distributions, you @@ -43,12 +43,12 @@ osrf_control --localhost --stop-all .. Back up the /openils directory. . Upgrade OpenSRF. Download and install the latest version of OpenSRF from the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page]. -. As the *opensrf* user, download and extract Evergreen 3.X.X: +. As the *opensrf* user, download and extract Evergreen 3.14.7: + [source, bash] ----------------------------------------------- -wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.X.X.tar.gz -tar xzf Evergreen-ILS-3.X.X.tar.gz +wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.14.7.tar.gz +tar xzf Evergreen-ILS-3.14.7.tar.gz ----------------------------------------------- + [NOTE] @@ -58,7 +58,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl + [source, bash] --------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.14.7 --------------------------------------------- + On the next command, replace `[distribution]` with one of these values for your @@ -83,7 +83,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution] + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.14.7 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf make ------------------------------------------------------------ @@ -94,7 +94,7 @@ These instructions assume that you have also installed OpenSRF under /openils/. + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.14.7 make install ------------------------------------------------------------ + @@ -123,7 +123,7 @@ Copying these configuration files will remove any customizations you have made t + [source, bash] ------------------------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.14.7 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \ --create-offline --database evergreen --host localhost --user evergreen --password evergreen ------------------------------------------------------------------------- @@ -147,21 +147,21 @@ The diff command can be used to show the differences between the distribution ve + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup +cp /home/opensrf/Evergreen-ILS-3.14.7/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup ---------------------------------------------------------- + .. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf. + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf +cp /home/opensrf/Evergreen-ILS-3.14.7/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf ---------------------------------------------------------- + .. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf. + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf +cp /home/opensrf/Evergreen-ILS-3.14.7/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf ---------------------------------------------------------- == Upgrade the Evergreen database schema == @@ -217,8 +217,8 @@ as a user with the ability to connect to the database server. [source, bash] ---------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/src/sql/Pg -psql -U evergreen -h localhost -f version-upgrade/3.X.W-3.X.X-upgrade-db.sql evergreen +cd /home/opensrf/Evergreen-ILS-3.14.7/Open-ILS/src/sql/Pg +psql -U evergreen -h localhost -f version-upgrade/3.14.6-3.14.7-upgrade-db.sql evergreen ---------------------------------------------------------- [TIP] ----------------------------------------------------------------------- hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. d38f7262a47bbbbb5ce08f94b999c15168281356
by Git User 18 Jun '25

18 Jun '25

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, rel_3_15 has been updated via d38f7262a47bbbbb5ce08f94b999c15168281356 (commit) from d9054513e29ac534e1e4f3a6fae1e5e42cf24394 (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 d38f7262a47bbbbb5ce08f94b999c15168281356 Author: Jane Sandberg <js7389(a)princeton.edu> Date: Wed Jun 18 14:40:41 2025 -0700 Forward-port 3.14.7 upgrade script Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.14.6-3.14.7-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.14.6-3.14.7-upgrade-db.sql new file mode 100644 index 0000000000..06bdd9802b --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.14.6-3.14.7-upgrade-db.sql @@ -0,0 +1,26 @@ +--Upgrade Script for 3.14.6 to 3.14.7 +\set eg_version '''3.14.7''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.14.7', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('1471', :eg_version); + +CREATE OR REPLACE FUNCTION evergreen.oils_xpath_string(text, text, text, anyarray) RETURNS text +AS $F$ + SELECT ARRAY_TO_STRING( + oils_xpath( + $1 || + CASE WHEN $1 ~ $re$/[^/[]*@[^]]+$$re$ OR $1 ~ $re$\)$$re$ THEN '' ELSE '//text()' END, + $2, + $4 + ), + $3 + ); +$F$ LANGUAGE SQL IMMUTABLE; + + +COMMIT; + +-- Update auditor tables to catch changes to source tables. +-- Can be removed/skipped if there were no schema changes. +SELECT auditor.update_auditors(); ----------------------------------------------------------------------- Summary of changes: .../3.14.6-3.14.7-upgrade-db.sql} | 7 +++++++ 1 file changed, 7 insertions(+) copy Open-ILS/src/sql/Pg/{upgrade/1471.function.oils_xpath_string.sql => version-upgrade/3.14.6-3.14.7-upgrade-db.sql} (62%) hooks/post-receive -- Evergreen ILS

1 0