From: Dan Scott <dscott@laurentian.ca>
Date: Fri, 15 Mar 2013 14:22:13 +0000 (-0400)
Subject: Wrap upgrade script for use ID as TCN value fix
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=64bdb45d4ca0047f8573fd0f7f643a0df7c5a706;p=contrib%2FConifer.git

Wrap upgrade script for use ID as TCN value fix

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c1feea7af6..e9bc0e290a 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 ('0782', :eg_version); -- miker/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0783', :eg_version); -- gmcharlt/dbs
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0783.schema.enforce_use_id_for_tcn.sql b/Open-ILS/src/sql/Pg/upgrade/0783.schema.enforce_use_id_for_tcn.sql
new file mode 100644
index 0000000000..0f1381149e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0783.schema.enforce_use_id_for_tcn.sql
@@ -0,0 +1,112 @@
+-- Evergreen DB patch 0783.schema.enforce_use_id_for_tcn.sql
+--
+-- Sets the TCN value in the biblio.record_entry row to bib ID,
+-- if the appropriate setting is in place
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0783', :eg_version);
+
+-- FIXME: add/check SQL statements to perform the upgrade
+CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$
+use strict;
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+use Encode;
+use Unicode::Normalize;
+
+MARC::Charset->assume_unicode(1);
+
+my $schema = $_TD->{table_schema};
+my $marc = MARC::Record->new_from_xml($_TD->{new}{marc});
+
+my @old901s = $marc->field('901');
+$marc->delete_fields(@old901s);
+
+if ($schema eq 'biblio') {
+    my $tcn_value = $_TD->{new}{tcn_value};
+
+    # Set TCN value to record ID?
+    my $id_as_tcn = spi_exec_query("
+        SELECT enabled
+        FROM config.global_flag
+        WHERE name = 'cat.bib.use_id_for_tcn'
+    ");
+    if (($id_as_tcn->{processed}) && $id_as_tcn->{rows}[0]->{enabled} eq 't') {
+        $tcn_value = $_TD->{new}{id}; 
+        $_TD->{new}{tcn_value} = $tcn_value;
+    }
+
+    my $new_901 = MARC::Field->new("901", " ", " ",
+        "a" => $tcn_value,
+        "b" => $_TD->{new}{tcn_source},
+        "c" => $_TD->{new}{id},
+        "t" => $schema
+    );
+
+    if ($_TD->{new}{owner}) {
+        $new_901->add_subfields("o" => $_TD->{new}{owner});
+    }
+
+    if ($_TD->{new}{share_depth}) {
+        $new_901->add_subfields("d" => $_TD->{new}{share_depth});
+    }
+
+    $marc->append_fields($new_901);
+} elsif ($schema eq 'authority') {
+    my $new_901 = MARC::Field->new("901", " ", " ",
+        "c" => $_TD->{new}{id},
+        "t" => $schema,
+    );
+    $marc->append_fields($new_901);
+} elsif ($schema eq 'serial') {
+    my $new_901 = MARC::Field->new("901", " ", " ",
+        "c" => $_TD->{new}{id},
+        "t" => $schema,
+        "o" => $_TD->{new}{owning_lib},
+    );
+
+    if ($_TD->{new}{record}) {
+        $new_901->add_subfields("r" => $_TD->{new}{record});
+    }
+
+    $marc->append_fields($new_901);
+} else {
+    my $new_901 = MARC::Field->new("901", " ", " ",
+        "c" => $_TD->{new}{id},
+        "t" => $schema,
+    );
+    $marc->append_fields($new_901);
+}
+
+my $xml = $marc->as_xml_record();
+$xml =~ s/\n//sgo;
+$xml =~ s/^<\?xml.+\?\s*>//go;
+$xml =~ s/>\s+</></go;
+$xml =~ s/\p{Cc}//go;
+
+# Embed a version of OpenILS::Application::AppUtils->entityize()
+# to avoid having to set PERL5LIB for PostgreSQL as well
+
+# If we are going to convert non-ASCII characters to XML entities,
+# we had better be dealing with a UTF8 string to begin with
+$xml = decode_utf8($xml);
+
+$xml = NFC($xml);
+
+# Convert raw ampersands to entities
+$xml =~ s/&(?!\S+;)/&amp;/gso;
+
+# Convert Unicode characters to entities
+$xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
+
+$xml =~ s/[\x00-\x1f]//go;
+$_TD->{new}{marc} = $xml;
+
+return "MODIFY";
+$func$ LANGUAGE PLPERLU;
+
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql
deleted file mode 100644
index 87d74bd4ec..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.enforce_use_id_for_tcn.sql
+++ /dev/null
@@ -1,98 +0,0 @@
-CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$
-use strict;
-use MARC::Record;
-use MARC::File::XML (BinaryEncoding => 'UTF-8');
-use MARC::Charset;
-use Encode;
-use Unicode::Normalize;
-
-MARC::Charset->assume_unicode(1);
-
-my $schema = $_TD->{table_schema};
-my $marc = MARC::Record->new_from_xml($_TD->{new}{marc});
-
-my @old901s = $marc->field('901');
-$marc->delete_fields(@old901s);
-
-if ($schema eq 'biblio') {
-    my $tcn_value = $_TD->{new}{tcn_value};
-
-    # Set TCN value to record ID?
-    my $id_as_tcn = spi_exec_query("
-        SELECT enabled
-        FROM config.global_flag
-        WHERE name = 'cat.bib.use_id_for_tcn'
-    ");
-    if (($id_as_tcn->{processed}) && $id_as_tcn->{rows}[0]->{enabled} eq 't') {
-        $tcn_value = $_TD->{new}{id}; 
-        $_TD->{new}{tcn_value} = $tcn_value;
-    }
-
-    my $new_901 = MARC::Field->new("901", " ", " ",
-        "a" => $tcn_value,
-        "b" => $_TD->{new}{tcn_source},
-        "c" => $_TD->{new}{id},
-        "t" => $schema
-    );
-
-    if ($_TD->{new}{owner}) {
-        $new_901->add_subfields("o" => $_TD->{new}{owner});
-    }
-
-    if ($_TD->{new}{share_depth}) {
-        $new_901->add_subfields("d" => $_TD->{new}{share_depth});
-    }
-
-    $marc->append_fields($new_901);
-} elsif ($schema eq 'authority') {
-    my $new_901 = MARC::Field->new("901", " ", " ",
-        "c" => $_TD->{new}{id},
-        "t" => $schema,
-    );
-    $marc->append_fields($new_901);
-} elsif ($schema eq 'serial') {
-    my $new_901 = MARC::Field->new("901", " ", " ",
-        "c" => $_TD->{new}{id},
-        "t" => $schema,
-        "o" => $_TD->{new}{owning_lib},
-    );
-
-    if ($_TD->{new}{record}) {
-        $new_901->add_subfields("r" => $_TD->{new}{record});
-    }
-
-    $marc->append_fields($new_901);
-} else {
-    my $new_901 = MARC::Field->new("901", " ", " ",
-        "c" => $_TD->{new}{id},
-        "t" => $schema,
-    );
-    $marc->append_fields($new_901);
-}
-
-my $xml = $marc->as_xml_record();
-$xml =~ s/\n//sgo;
-$xml =~ s/^<\?xml.+\?\s*>//go;
-$xml =~ s/>\s+</></go;
-$xml =~ s/\p{Cc}//go;
-
-# Embed a version of OpenILS::Application::AppUtils->entityize()
-# to avoid having to set PERL5LIB for PostgreSQL as well
-
-# If we are going to convert non-ASCII characters to XML entities,
-# we had better be dealing with a UTF8 string to begin with
-$xml = decode_utf8($xml);
-
-$xml = NFC($xml);
-
-# Convert raw ampersands to entities
-$xml =~ s/&(?!\S+;)/&amp;/gso;
-
-# Convert Unicode characters to entities
-$xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
-
-$xml =~ s/[\x00-\x1f]//go;
-$_TD->{new}{marc} = $xml;
-
-return "MODIFY";
-$func$ LANGUAGE PLPERLU;