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

[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  acd548c42804803742e3c5b0cbf80700391d5bb2 (commit)
       via  d509b29483112be2d8326535ec4272b3e5df2199 (commit)
      from  75068290eed6580ac9e9f758aa5bc751c88953d4 (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 acd548c42804803742e3c5b0cbf80700391d5bb2
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/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 d509b29483112be2d8326535ec4272b3e5df2199
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/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:
 .../0559.schema.biblio.extract_located_uris.sql    |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS