From bfad436e3ed345459beb7fb1938edb2ff67b43c4 Mon Sep 17 00:00:00 2001 From: dbs Date: Fri, 16 Jul 2010 15:23:15 +0000 Subject: [PATCH] serial.record_entry already had an owner column spelled "owning_lib" Adjust the table and affected function accordingly git-svn-id: svn://svn.open-ils.org/ILS/trunk@16963 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/002.functions.config.sql | 9 +- Open-ILS/src/sql/Pg/210.schema.serials.sql | 1 - .../upgrade/0340.schema.serials_remove_owner.sql | 133 +++++++++++++++++++++ 3 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0340.schema.serials_remove_owner.sql diff --git a/Open-ILS/src/sql/Pg/002.functions.config.sql b/Open-ILS/src/sql/Pg/002.functions.config.sql index fb1d3b28e..4d8875628 100644 --- a/Open-ILS/src/sql/Pg/002.functions.config.sql +++ b/Open-ILS/src/sql/Pg/002.functions.config.sql @@ -489,8 +489,13 @@ if (!($enable->{processed}) or $enable->{rows}[0]->{enabled} eq 'f') { # Get the control number identifier from an OU setting based on $_TD->{new}{owner} my $ou_cni = 'EVRGRN'; -# bre.owner can be null, so fall back to the consortial setting -my $owner = $_TD->{new}{owner} || 1; +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}) { diff --git a/Open-ILS/src/sql/Pg/210.schema.serials.sql b/Open-ILS/src/sql/Pg/210.schema.serials.sql index 957ba04f2..2fb347344 100644 --- a/Open-ILS/src/sql/Pg/210.schema.serials.sql +++ b/Open-ILS/src/sql/Pg/210.schema.serials.sql @@ -19,7 +19,6 @@ CREATE TABLE serial.record_entry ( deleted BOOL NOT NULL DEFAULT FALSE, marc TEXT, last_xact_id TEXT NOT NULL, - owner INT ); CREATE INDEX serial_record_entry_creator_idx ON serial.record_entry ( creator ); CREATE INDEX serial_record_entry_editor_idx ON serial.record_entry ( editor ); diff --git a/Open-ILS/src/sql/Pg/upgrade/0340.schema.serials_remove_owner.sql b/Open-ILS/src/sql/Pg/upgrade/0340.schema.serials_remove_owner.sql new file mode 100644 index 000000000..e2fb634dc --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0340.schema.serials_remove_owner.sql @@ -0,0 +1,133 @@ +-- serial.record_entry already had an owner column spelled "owning_lib" +-- Adjust the table and affected functions accordingly +BEGIN; + +ALTER TABLE serial.record_entry DROP COLUMN owner; + +CREATE OR REPLACE FUNCTION maintain_control_numbers() RETURNS TRIGGER AS $func$ +use strict; +use MARC::Record; +use MARC::File::XML; +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); +my ($orig_001, $orig_003) = ('', ''); + +# 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 +if ($munge) { + 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.11.0