@@ -, +, @@ on default MARC21 auth framework --- .../marc21/mandatory/authorities_normal_marc21.sql | 48 ++++++++++---------- installer/data/mysql/updatedatabase.pl | 7 +++ 2 files changed, 31 insertions(+), 24 deletions(-) --- a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql +++ a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql @@ -1510,32 +1510,32 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '684', '8', 'Field link and sequence number', 'Field link and sequence number', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '685', 'a', 'Source consulted and information found', 'Source consulted and information found', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '685', '6', 'Linkage', 'Linkage', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'a', 'New number--Single number or beginning number of span', 'New number--Single number or beginning number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'b', 'Previous number--Single number or beginning number of span', 'Previous number--Single number or beginning number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'c', 'Classification number--ending number of span', 'Classification number--ending number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'd', 'Date of implementation of authoritative agency', 'Date of implementation of authoritative agency', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'e', 'Local implementation date', 'Local implementation date', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'f', 'Title and publication date', 'Title and publication date', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'i', 'Explanatory text', 'Explanatory text', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 't', 'Topic', 'Topic', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', 'z', 'Table identification', 'Table identification', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', '2', 'Edition number', 'Edition number', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', '5', 'Institution to which field applies', 'Institution to which field applies', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', '6', 'Linkage', 'Linkage', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68a', '8', 'Field link and sequence number', 'Field link and sequence number', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'a', 'New number--Single number or beginning number of span', 'New number--Single number or beginning number of span', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'b', 'Previous number--Single number or beginning number of span', 'Previous number--Single number or beginning number of span', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'c', 'Classification number--ending number of span', 'Classification number--ending number of span', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'd', 'Date of implementation of authoritative agency', 'Date of implementation of authoritative agency', 0, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'e', 'Local implementation date', 'Local implementation date', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'f', 'Title and publication date', 'Title and publication date', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'i', 'Explanatory text', 'Explanatory text', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 't', 'Topic', 'Topic', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', 'z', 'Table identification', 'Table identification', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', '2', 'Edition number', 'Edition number', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', '5', 'Institution to which field applies', 'Institution to which field applies', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', '6', 'Linkage', 'Linkage', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68a', '8', 'Field link and sequence number', 'Field link and sequence number', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '686', 'a', 'Source consulted and information found', 'Source consulted and information found', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '686', '6', 'Linkage', 'Linkage', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 'a', 'Number in edition described in field 084--Single number or beginning number of span', 'Number in edition described in field 084--Single number or beginning number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 'b', 'Number in primary source edition--Single number or beginning number of span', 'Number in primary source edition--Single number or beginning number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 'c', 'Ending number of span', 'Ending number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 'i', 'Explanatory text', 'Explanatory text', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 'o', 'Number where instructions are found--Single number or beginning number of span', 'Number where instructions are found--Single number or beginning number of span', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 't', 'Topic', 'Topic', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', 'z', 'Table identification', 'Table identification', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', '2', 'Edition number', 'Edition number', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', '5', 'Institution to which field applies', 'Institution to which field applies', 1, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', '6', 'Linkage', 'Linkage', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '68b', '8', 'Field link and sequence number', 'Field link and sequence number', 0, 0, 0, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 'a', 'Number in edition described in field 084--Single number or beginning number of span', 'Number in edition described in field 084--Single number or beginning number of span', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 'b', 'Number in primary source edition--Single number or beginning number of span', 'Number in primary source edition--Single number or beginning number of span', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 'c', 'Ending number of span', 'Ending number of span', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 'i', 'Explanatory text', 'Explanatory text', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 'o', 'Number where instructions are found--Single number or beginning number of span', 'Number where instructions are found--Single number or beginning number of span', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 't', 'Topic', 'Topic', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', 'z', 'Table identification', 'Table identification', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', '2', 'Edition number', 'Edition number', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', '5', 'Institution to which field applies', 'Institution to which field applies', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', '6', 'Linkage', 'Linkage', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '68b', '8', 'Field link and sequence number', 'Field link and sequence number', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '687', 'a', 'Source consulted and information found', 'Source consulted and information found', 1, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '687', '6', 'Linkage', 'Linkage', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '688', 'a', 'Application history note', 'Application history note', 0, 0, 6, NULL, NULL, NULL, 0, 0, '', '', ''), --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -7067,6 +7067,13 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("UPDATE auth_subfield_structure SET tab = 6 WHERE tagfield IN ('68a','68b')"); + print "Upgrade to $DBversion done (Bug 10687 - Incorrect tab information for tags 86a and 86b on default MARC21 auth framework)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) --