[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 7264d57ce9598fe2f1a52580535215b6db7f0c28

[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_0 has been updated
       via  7264d57ce9598fe2f1a52580535215b6db7f0c28 (commit)
       via  81eda392949ab4945c5ab8363da75103d5ad00b1 (commit)
      from  2e0b5c2672298063f49d036336edfdb0cc2b9868 (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 7264d57ce9598fe2f1a52580535215b6db7f0c28
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon Jun 20 11:16:21 2011 -0400

    DROP biblio.reingest_uris() after use
    
    We will hopefully only need to reingest URIs in bulk once, and can
    therefore DROP the biblio.reingest_uris() function after it has been
    successfully invoked.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql b/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql
index 439ae05..7df04ac 100644
--- a/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql
@@ -939,5 +939,7 @@ $func$ LANGUAGE PLPGSQL;
 -- Kick off the reingest; this may take a while
 SELECT biblio.reingest_uris();
 
+-- Hopefully this isn't something we'll need to run again
+DROP FUNCTION biblio.reingest_uris();
 
 COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql b/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql
index cb71045..62813b1 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql
@@ -151,5 +151,7 @@ $func$ LANGUAGE PLPGSQL;
 -- Kick off the reingest; this may take a while
 SELECT biblio.reingest_uris();
 
+-- Hopefully this isn't something we'll need to run again
+DROP FUNCTION biblio.reingest_uris();
 
 COMMIT;

commit 81eda392949ab4945c5ab8363da75103d5ad00b1
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon Jun 20 10:56:44 2011 -0400

    Protect URI reingest from failure due to malformed XML
    
    In an ideal world, there would be no malformed XML. But our world is the
    real world of libraries, and while the well_formed_xml() protects
    against malformed XML in Evergreen 2.0 systems, in some cases bad XML
    has been able to find its way into Evergreen systems in the past.
    
    A single biblio.record_entry row containing malformed XML in the marc
    column will prevent the call to reingest URIs from succeeding. By
    limiting the set of records to those with well-formed XML, we can
    increase the chance of the URI reingest succeeding at the cost of more
    processing time.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql b/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql
index c57c812..439ae05 100644
--- a/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql
@@ -921,7 +921,9 @@ BEGIN
             FROM asset.call_number acn
                 INNER JOIN asset.uri_call_number_map auricnm ON auricnm.call_number = acn.id
                 INNER JOIN asset.uri auri ON auri.id = auricnm.uri
+                INNER JOIN biblio.record_entry bre ON acn.record = bre.id
             WHERE auri.href = auri.label
+                AND xml_is_well_formed(bre.marc)
             GROUP BY acn.record
             ORDER BY acn.record
         ) AS rec_uris
diff --git a/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql b/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql
index 9287e99..cb71045 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0559.schema.biblio.extract_located_uris.sql
@@ -133,7 +133,9 @@ BEGIN
             FROM asset.call_number acn
                 INNER JOIN asset.uri_call_number_map auricnm ON auricnm.call_number = acn.id
                 INNER JOIN asset.uri auri ON auri.id = auricnm.uri
+                INNER JOIN biblio.record_entry bre ON acn.record = bre.id
             WHERE auri.href = auri.label
+                AND xml_is_well_formed(bre.marc)
             GROUP BY acn.record
             ORDER BY acn.record
         ) AS rec_uris

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

Summary of changes:
 Open-ILS/src/sql/Pg/2.0.6-2.0.7-upgrade-db.sql     |    4 ++++
 .../0559.schema.biblio.extract_located_uris.sql    |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS