From 383fd99ecdf54225652957417541565d72a2fe62 Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 11 Nov 2010 16:55:52 +0000 Subject: [PATCH] Avoid munging 035 when a new record is created If there is no 003 in the record when it is created, then we will not attempt to generate a 035. If the incoming record contains a 001 and 003, then we will create a 035. git-svn-id: svn://svn.open-ils.org/ILS/trunk@18707 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/002.functions.config.sql | 6 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql | 6 +- ...0464.function.maintain_control_numbers.sql | 131 ++++++++++++++++++ 4 files changed, 138 insertions(+), 7 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0464.function.maintain_control_numbers.sql diff --git a/Open-ILS/src/sql/Pg/002.functions.config.sql b/Open-ILS/src/sql/Pg/002.functions.config.sql index 615f06b6f2..818348c5e6 100644 --- a/Open-ILS/src/sql/Pg/002.functions.config.sql +++ b/Open-ILS/src/sql/Pg/002.functions.config.sql @@ -512,7 +512,6 @@ if ($ous_rv->{processed}) { } my ($create, $munge) = (0, 0); -my ($orig_001, $orig_003) = ('', ''); # Incoming MARC records may have multiple 001s or 003s, despite the spec my @control_ids = $record->field('003'); @@ -552,8 +551,9 @@ foreach my $id_field ('001', '003') { } } -# Now, if we need to munge the 001, we will first push the existing 001/003 into the 035 -if ($munge) { +# Now, if we need to munge the 001, we will first push the existing 001/003 into the 035; +# but if the record did not have a 003 to begin with, skip this process +if ($munge && scalar(@control_ids) > 0) { my $scn = "(" . $record->field('003')->data() . ")" . $record->field('001')->data(); # Do not create duplicate 035 fields diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index a0d90bf9ed..61f20be135 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -70,7 +70,7 @@ CREATE TABLE config.upgrade_log ( install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() ); -INSERT INTO config.upgrade_log (version) VALUES ('0463'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0464'); -- dbs CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql index ae220625af..d43764bf77 100644 --- a/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql @@ -16962,7 +16962,6 @@ if ($ous_rv->{processed}) { } my ($create, $munge) = (0, 0); -my ($orig_001, $orig_003) = ('', ''); # Incoming MARC records may have multiple 001s or 003s, despite the spec my @control_ids = $record->field('003'); @@ -17002,8 +17001,9 @@ foreach my $id_field ('001', '003') { } } -# Now, if we need to munge the 001, we will first push the existing 001/003 into the 035 -if ($munge) { +# Now, if we need to munge the 001, we will first push the existing 001/003 into the 035; +# but if the record did not have a 003 to begin with, skip this process +if ($munge && scalar(@control_ids) > 0) { my $scn = "(" . $record->field('003')->data() . ")" . $record->field('001')->data(); # Do not create duplicate 035 fields diff --git a/Open-ILS/src/sql/Pg/upgrade/0464.function.maintain_control_numbers.sql b/Open-ILS/src/sql/Pg/upgrade/0464.function.maintain_control_numbers.sql new file mode 100644 index 0000000000..9947fc4036 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0464.function.maintain_control_numbers.sql @@ -0,0 +1,131 @@ +BEGIN; + +INSERT INTO config.upgrade_log (version) VALUES ('0464'); -- dbs + +CREATE OR REPLACE FUNCTION maintain_control_numbers() RETURNS TRIGGER AS $func$ +use strict; +use MARC::Record; +use MARC::File::XML (BinaryEncoding => 'UTF-8'); +use Encode; +use Unicode::Normalize; + +my $record = MARC::Record->new_from_xml($_TD->{new}{marc}); +my $schema = $_TD->{table_schema}; +my $rec_id = $_TD->{new}{id}; + +# Short-circuit if maintaining control numbers per MARC21 spec is not enabled +my $enable = spi_exec_query("SELECT enabled FROM config.global_flag WHERE name = 'cat.maintain_control_numbers'"); +if (!($enable->{processed}) or $enable->{rows}[0]->{enabled} eq 'f') { + return; +} + +# Get the control number identifier from an OU setting based on $_TD->{new}{owner} +my $ou_cni = 'EVRGRN'; + +my $owner; +if ($schema eq 'serial') { + $owner = $_TD->{new}{owning_lib}; +} else { + # are.owner and bre.owner can be null, so fall back to the consortial setting + $owner = $_TD->{new}{owner} || 1; +} + +my $ous_rv = spi_exec_query("SELECT value FROM actor.org_unit_ancestor_setting('cat.marc_control_number_identifier', $owner)"); +if ($ous_rv->{processed}) { + $ou_cni = $ous_rv->{rows}[0]->{value}; + $ou_cni =~ s/"//g; # Stupid VIM syntax highlighting" +} else { + # Fall back to the shortname of the OU if there was no OU setting + $ous_rv = spi_exec_query("SELECT shortname FROM actor.org_unit WHERE id = $owner"); + if ($ous_rv->{processed}) { + $ou_cni = $ous_rv->{rows}[0]->{shortname}; + } +} + +my ($create, $munge) = (0, 0); + +# Incoming MARC records may have multiple 001s or 003s, despite the spec +my @control_ids = $record->field('003'); +my @scns = $record->field('035'); + +foreach my $id_field ('001', '003') { + my $spec_value; + my @controls = $record->field($id_field); + + if ($id_field eq '001') { + $spec_value = $rec_id; + } else { + $spec_value = $ou_cni; + } + + # Create the 001/003 if none exist + if (scalar(@controls) == 0) { + $record->insert_fields_ordered(MARC::Field->new($id_field, $spec_value)); + $create = 1; + } elsif (scalar(@controls) > 1) { + # Do we already have the right 001/003 value in the existing set? + unless (grep $_->data() eq $spec_value, @controls) { + $munge = 1; + } + + # Delete the other fields, as with more than 1 001/003 we do not know which 003/001 to match + foreach my $control (@controls) { + unless ($control->data() eq $spec_value) { + $record->delete_field($control); + } + } + } else { + # Only one field; check to see if we need to munge it + unless (grep $_->data() eq $spec_value, @controls) { + $munge = 1; + } + } +} + +# Now, if we need to munge the 001, we will first push the existing 001/003 into the 035; +# but if the record did not have a 003 to begin with, skip this process +if ($munge && scalar(@control_ids) > 0) { + my $scn = "(" . $record->field('003')->data() . ")" . $record->field('001')->data(); + + # Do not create duplicate 035 fields + unless (grep $_->subfield('a') eq $scn, @scns) { + $record->insert_fields_ordered(MARC::Field->new('035', '', '', 'a' => $scn)); + } +} + +# Set the 001/003 and update the MARC +if ($create or $munge) { + $record->field('001')->data($rec_id); + $record->field('003')->data($ou_cni); + + my $xml = $record->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"; +} + +return; +$func$ LANGUAGE PLPERLU; + +COMMIT; -- 2.43.2