[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. 22761d85fcc0edbf60eeb26be33f337aa72011f3

[Evergreen Git]

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_2_4 has been updated
       via  22761d85fcc0edbf60eeb26be33f337aa72011f3 (commit)
       via  32c06280e2f72980bc2753beceb75c82dc1296f9 (commit)
      from  0778472f110cb1b008f24395de55c08a519c74c3 (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 22761d85fcc0edbf60eeb26be33f337aa72011f3
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Sep 6 23:20:16 2013 -0400

    Stamping upgrade script for biblio A/T title variable fix
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    
    Conflicts:
    	Open-ILS/src/sql/Pg/002.schema.config.sql

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 0818731..7788ac8 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0821', :eg_version); -- miker/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0825', :eg_version); -- phasefx/bshum
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql b/Open-ILS/src/sql/Pg/upgrade/0825.data.bre_format.sql
similarity index 79%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql
rename to Open-ILS/src/sql/Pg/upgrade/0825.data.bre_format.sql
index 86644b4..71e9554 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0825.data.bre_format.sql
@@ -1,11 +1,11 @@
--- Evergreen DB patch XXXX.data.bre_format.sql
+-- Evergreen DB patch 0825.data.bre_format.sql
 --
 -- Fix some templates that loop over bibs to not have duplicated/run-on titles
 --
 BEGIN;
 
 -- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0825', :eg_version);
 
 -- I think we shy away from modifying templates on existing systems, but this seems pretty safe...
 UPDATE

commit 32c06280e2f72980bc2753beceb75c82dc1296f9
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Nov 8 11:27:13 2012 -0500

    reset title variable when looping with biblio A/T
    
    Two templates that I'm concerned with, though there may be others that could use
    this treatment: biblio.record_entry.email and biblio.record_entry.print
    
    Basically, they can group events from the same user and consolidate bibs, but as
    they loop through the bibs they're not clearing the temporary variable that
    contains the bib title, so we get duplicated and run-on titles in the output.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    
    Conflicts:
    	Open-ILS/src/sql/Pg/002.schema.config.sql

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 0c4d18e..0667da5 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -8851,7 +8851,7 @@ To: [%- params.recipient_email || user.email %]
 From: [%- params.sender_email || default_sender %]
 Subject: Bibliographic Records
 
-[% FOR cbreb IN target %]
+[% FOR cbreb IN target %][% title = '' %]
 [% FOR item IN cbreb.items;
     bre_id = item.target_biblio_record_entry;
 
@@ -8899,7 +8899,7 @@ $$
 <div>
     <style> li { padding: 8px; margin 5px; }</style>
     <ol>
-    [% FOR cbreb IN target %]
+    [% FOR cbreb IN target %][% title = '' %]
     [% FOR item IN cbreb.items;
         bre_id = item.target_biblio_record_entry;
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql
new file mode 100644
index 0000000..86644b4
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql
@@ -0,0 +1,18 @@
+-- Evergreen DB patch XXXX.data.bre_format.sql
+--
+-- Fix some templates that loop over bibs to not have duplicated/run-on titles
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+-- I think we shy away from modifying templates on existing systems, but this seems pretty safe...
+UPDATE
+    action_trigger.event_definition
+SET
+    template = replace(template,'[% FOR cbreb IN target %]','[% FOR cbreb IN target %][% title = '''' %]')
+WHERE
+    id IN (31,32);
+
+COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    4 ++--
 .../src/sql/Pg/upgrade/0825.data.bre_format.sql    |   18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0825.data.bre_format.sql


hooks/post-receive
-- 
Evergreen ILS