From d128743dccb6a252f2765d93fcd5cefc0e7f958d Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Fri, 27 Jul 2012 16:27:29 -0400 Subject: [PATCH] Use MARC::Field objects to append new fields While the deprecated MARC::Record::add_fields() method allows you to add a list of fields using a list object, append_fields() requires MARC::Field objects. Signed-off-by: Dan Scott Signed-off-by: Thomas Berezansky --- Open-ILS/src/sql/Pg/002.functions.config.sql | 18 ++-- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- .../upgrade/0726.schema.fix_maintain_901_regex.sql | 103 +++++++++++++++++++++ 3 files changed, 112 insertions(+), 11 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql diff --git a/Open-ILS/src/sql/Pg/002.functions.config.sql b/Open-ILS/src/sql/Pg/002.functions.config.sql index 0a9392250a..4f64917884 100644 --- a/Open-ILS/src/sql/Pg/002.functions.config.sql +++ b/Open-ILS/src/sql/Pg/002.functions.config.sql @@ -465,12 +465,11 @@ if ($schema eq 'biblio') { $marc->append_fields($new_901); } elsif ($schema eq 'authority') { - $marc->append_fields( - ["901", " ", " ", - "c" => $_TD->{new}{id}, - "t" => $schema, - ] + 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}, @@ -484,12 +483,11 @@ if ($schema eq 'biblio') { $marc->append_fields($new_901); } else { - $marc->append_fields( - ["901", " ", " ", - "c" => $_TD->{new}{id}, - "t" => $schema, - ] + my $new_901 = MARC::Field->new("901", " ", " ", + "c" => $_TD->{new}{id}, + "t" => $schema, ); + $marc->append_fields($new_901); } my $xml = $marc->as_xml_record(); diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 5149753532..64a1a6a133 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -87,7 +87,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 ('0725', :eg_version); -- gmcharlt/denials +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0726', :eg_version); -- denials CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql b/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql new file mode 100644 index 0000000000..2cd5c0d02e --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql @@ -0,0 +1,103 @@ +BEGIN; + +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0726', :eg_version); -- denials + +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}; + } + + 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+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+;)/&/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; -- 2.11.0