[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. bb6f48d88c57c67bb33b4975c63aacead8b11cf2

[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_1 has been updated
       via  bb6f48d88c57c67bb33b4975c63aacead8b11cf2 (commit)
       via  4eae8cdad8f32c31671b6ecec73122263aeb98f6 (commit)
      from  c0e3515dbbf5ac7941b183d6f0f063d1e2b992d0 (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 bb6f48d88c57c67bb33b4975c63aacead8b11cf2
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Mar 26 11:02:33 2012 -0400

    Stamping upgrade script for ISSN normalization fix
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 177bbc6..7aff4be 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0665'); -- phasefx/miker
+INSERT INTO config.upgrade_log (version) VALUES ('0693'); -- denials/miker
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.do_not_despace_issns.sql b/Open-ILS/src/sql/Pg/upgrade/0693.schema.do_not_despace_issns.sql
similarity index 92%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.do_not_despace_issns.sql
rename to Open-ILS/src/sql/Pg/upgrade/0693.schema.do_not_despace_issns.sql
index b788a2d..cd6b29f 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.do_not_despace_issns.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0693.schema.do_not_despace_issns.sql
@@ -1,3 +1,7 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0693');
+
 -- Delete the index normalizer that was meant to remove spaces from ISSNs
 -- but ended up breaking records with multiple ISSNs
 DELETE FROM config.metabib_field_index_norm_map WHERE id IN (
@@ -19,3 +23,6 @@ SELECT metabib.reingest_metabib_field_entries(source)
     AND cmf.name = 'issn'
     AND char_length(value) > 9
 ;
+
+COMMIT;
+

commit 4eae8cdad8f32c31671b6ecec73122263aeb98f6
Author: Dan Scott <dan at coffeecode.net>
Date:   Wed Mar 21 22:48:46 2012 -0400

    LP932540: Fix ISSN indexing
    
    The default config.metabib_field_index_norm_map contains a 'replace'
    entry for the ISSN identifier field that replaces spaces with "". That
    was meant to handle ISSNs that incorrectly contain a space instead of a
    hyphen; it normalizes them from: "1234 1234" to "12341234".
    
    However, that breaks indexing ISSNs if there are multiple ISSNs in the
    record, or even if there is an extra character in the same subfield as
    the primary ISSN, as all spaces are removed.
    
    This commit removes the 'replace' entry for the ISSN identifier field
    and reindexes potentially damaged ISSN index entries.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

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 43c3892..67cd3f6 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -5881,15 +5881,6 @@ INSERT INTO config.metabib_field_index_norm_map (field,norm,params)
       WHERE i.func IN ('replace')
             AND m.id IN (19);
 
-INSERT INTO config.metabib_field_index_norm_map (field,norm,params)
-    SELECT  m.id,
-            i.id,
-            $$[" ",""]$$
-      FROM  config.metabib_field m,
-            config.index_normalizer i
-      WHERE i.func IN ('replace')
-            AND m.id IN (19);
-
 INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
     SELECT  m.name, i.id, 0
       FROM  config.record_attr_definition m,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.do_not_despace_issns.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.do_not_despace_issns.sql
new file mode 100644
index 0000000..b788a2d
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.do_not_despace_issns.sql
@@ -0,0 +1,21 @@
+-- Delete the index normalizer that was meant to remove spaces from ISSNs
+-- but ended up breaking records with multiple ISSNs
+DELETE FROM config.metabib_field_index_norm_map WHERE id IN (
+    SELECT map.id FROM config.metabib_field_index_norm_map map
+        INNER JOIN config.metabib_field cmf ON cmf.id = map.field
+        INNER JOIN config.index_normalizer cin ON cin.id = map.norm
+    WHERE cin.func = 'replace'
+        AND cmf.field_class = 'identifier'
+        AND cmf.name = 'issn'
+        AND map.params = $$[" ",""]$$
+);
+
+-- Reindex records that have more than just a single ISSN
+-- to ensure that spaces are maintained
+SELECT metabib.reingest_metabib_field_entries(source)
+  FROM metabib.identifier_field_entry mife
+    INNER JOIN config.metabib_field cmf ON cmf.id = mife.field
+  WHERE cmf.field_class = 'identifier'
+    AND cmf.name = 'issn'
+    AND char_length(value) > 9
+;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    9 ------
 .../upgrade/0693.schema.do_not_despace_issns.sql   |   28 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0693.schema.do_not_despace_issns.sql


hooks/post-receive
-- 
Evergreen ILS