From 1adf2620eaac8db20ca1d24f42157d3881b84354 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Tue, 17 Jun 2014 08:28:17 -0300 Subject: [PATCH] [PASSED QA] Bug 12435 - Update MARC21 frameworks to Update No. 18 (April 2014) This patch updates MARC21 frameworks to Update No. 18 (April 2014) Also updates values on database for MARC21 installs. To test 1. Apply the patch 2. Run updatedatbase.pl, check that runs without error 3. Remove default framework, load again. Check that loads without error. 4. Verify changes Bibs 007/04 Sound recording -> q Quadraphonic, multichannel, or surround 347f -> Encoded bitrate 110/1,610/1,710/1,810/1 subfield c -> repeatable Auth 110/1,410/1,510/1,710/1 subfield c -> repeatable Signed-off-by: Katrin Fischer Checked changes are according to documentation from LOC and consistent between sample files and updatedatabase.pl. No problems found, all English frameworks were updated. Signed-off-by: Kyle M Hall --- .../marc21/mandatory/authorities_normal_marc21.sql | 18 +++++++++--------- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 20 ++++++++++---------- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ .../cataloguing/value_builder/marc21_field_007.tt | 4 ++-- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql b/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql index dc7c1e6..90275df 100644 --- a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql +++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql @@ -1,7 +1,7 @@ -- ******************************************************* -- KOHA MARC 21 STANDARD DEFAULT AUTHORITY FRAMEWORKS -- --- Revised to Update No. 17 (September 2013) +-- Revised to Update No. 18 (April 2014) -- ******************************************************* -- ****************************************************** @@ -598,7 +598,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '100', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '110', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, 1, NULL, NULL, '''110b'',''110c'',''110d'',''110t'',''110o'',''110m'',''110r'',''110s'',''110k'',''110n'',''110p'',''110g'',''110l'',''110f'',''110h'',''110x'',''110z'',''110y'',''110v''', 0, 0, '', '', ''), ('', '110', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '110', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '110', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '110', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '110', 'e', 'Relator term', 'Relator term', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '110', 'f', 'Date of a work', 'Date of a work', 0, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -621,7 +621,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '110', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '111', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, 1, NULL, NULL, '''111e'',''111c'',''111d'',''111t'',''111s'',''111k'',''111n'',''111p'',''111g'',''111l'',''111f'',''111h'',''111x'',''111z'',''111y'',''111v''', 0, 0, '', '', ''), ('', '111', 'b', 'Number [OBSOLETE]', 'Number [OBSOLETE]', 0, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '111', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '111', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '111', 'd', 'Date of meeting', 'Date of meeting', 0, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '111', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '111', 'f', 'Date of a work', 'Date of a work', 0, 0, 1, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -969,7 +969,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '400', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, 4, NULL, NULL, NULL, 0, 1, '', '', ''), ('', '410', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, 4, NULL, NULL, '''410b'',''410c'',''410d'',''410t'',''410o'',''410m'',''410r'',''410s'',''410k'',''410n'',''410p'',''410g'',''410l'',''410f'',''410h'',''410x'',''410z'',''410y'',''410v''', 0, 0, '', '', 'CORPO_NAME'), ('', '410', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '410', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '410', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '410', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '410', 'e', 'Relator term', 'Relator term', 1, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '410', 'f', 'Date of a work', 'Date of a work', 0, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -997,7 +997,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '410', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, 4, NULL, NULL, NULL, 0, 1, '', '', ''), ('', '411', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, 4, NULL, NULL, '''411e'',''411c'',''411d'',''411t'',''411s'',''411k'',''411n'',''411p'',''411g'',''411l'',''411f'',''411h'',''411x'',''411z'',''411y'',''411v''', 0, 0, '', '', 'MEETI_NAME'), ('', '411', 'b', 'Number {OBSOLETE]', 'Number {OBSOLETE]', 0, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '411', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '411', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '411', 'd', 'Date of meeting', 'Date of meeting', 0, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '411', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '411', 'f', 'Date of a work', 'Date of a work', 0, 0, 4, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -1189,7 +1189,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '500', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, 5, NULL, NULL, NULL, 0, 1, '', '', ''), ('', '510', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, 5, NULL, NULL, '''510b'',''510c'',''510d'',''510t'',''510o'',''510m'',''510r'',''510s'',''510k'',''510n'',''510p'',''510g'',''510l'',''510f'',''510h'',''510x'',''510z'',''510y'',''510v''', 0, 0, '', '', 'CORPO_NAME'), ('', '510', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '510', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '510', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '510', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '510', 'e', 'Relator term', 'Relator term', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '510', 'f', 'Date of a work', 'Date of a work', 0, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -1217,7 +1217,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '510', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '510', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, 5, NULL, NULL, NULL, 0, 1, '', '', ''), ('', '511', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, 5, NULL, NULL, '''511e'',''511c'',''511d'',''511t'',''511s'',''511k'',''511n'',''511p'',''511g'',''511l'',''511f'',''511h'',''511x'',''511z'',''511y'',''511v''', 0, 0, '', '', 'MEETI_NAME'), - ('', '511', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '511', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '511', 'd', 'Date of meeting', 'Date of meeting', 0, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '511', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '511', 'f', 'Date of a work', 'Date of a work', 0, 0, 5, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -1552,7 +1552,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '700', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '710', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '710', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '710', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '710', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '710', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '710', 'e', 'Relator term', 'Relator term', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '710', 'f', 'Date of a work', 'Date of a work', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), @@ -1581,7 +1581,7 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` ('', '710', '6', 'Linkage', 'Linkage', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '710', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '711', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), - ('', '711', 'c', 'Location of meeting', 'Location of meeting', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), + ('', '711', 'c', 'Location of meeting', 'Location of meeting', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '711', 'd', 'Date of meeting', 'Date of meeting', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '711', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), ('', '711', 'f', 'Date of a work', 'Date of a work', 0, 0, 7, NULL, NULL, NULL, 0, 0, '', '', ''), diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql index bc08e76..e388649 100644 --- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql +++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql @@ -7,7 +7,7 @@ -- guided by Paul POULAIN -- by thd for LibLime -- --- Revised to Update No. 17 (September 2013) +-- Revised to Update No. 18 (April 2014) -- ************************************************************* @@ -918,7 +918,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('110', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('110', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, '', 1, '', 'CORPO_NAME', '', NULL, 0, '', '', '', NULL), ('110', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, '', 1, '', '', '', NULL, 0, '', '', '', NULL), - ('110', 'c', 'Location of meeting', 'Location of meeting', 0, 0, '', 1, '', '', '', NULL, -1, '', '', '', NULL), + ('110', 'c', 'Location of meeting', 'Location of meeting', 1, 0, '', 1, '', '', '', NULL, -1, '', '', '', NULL), ('110', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, '', 1, '', '', '', NULL, -1, '', '', '', NULL), ('110', 'e', 'Relator term', 'Relator term', 1, 0, '', 1, '', '', '', NULL, 0, '', '', '', NULL), ('110', 'f', 'Date of a work', 'Date of a work', 0, 0, '', 1, '', '', '', NULL, -6, '', '', '', NULL), @@ -936,7 +936,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('111', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('111', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, NULL, 1, NULL, 'MEETI_NAME', '', NULL, 0, '', '', '', NULL), ('111', 'b', 'Number [OBSOLETE]', 'Number [OBSOLETE]', 0, 0, NULL, 1, NULL, NULL, '', NULL, -6, '', '', '', NULL), - ('111', 'c', 'Location of meeting', 'Location of meeting', 0, 0, NULL, 1, NULL, NULL, '', NULL, 0, '', '', '', NULL), + ('111', 'c', 'Location of meeting', 'Location of meeting', 1, 0, NULL, 1, NULL, NULL, '', NULL, 0, '', '', '', NULL), ('111', 'd', 'Date of meeting', 'Date of meeting', 0, 0, NULL, 1, NULL, NULL, '', NULL, 0, '', '', '', NULL), ('111', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, NULL, 1, NULL, NULL, '', NULL, 0, '', '', '', NULL), ('111', 'f', 'Date of a work', 'Date of a work', 0, 0, NULL, 1, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -1321,7 +1321,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('347', 'c', 'File size', 'File size', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('347', 'd', 'Resolution', 'Resolution', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('347', 'e', 'Regional encoding', 'Regional encoding', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), - ('347', 'f', 'Transmission speed', 'Transmission speed', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), + ('347', 'f', 'Encoded bitrate', 'Encoded bitrate', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('350', '6', 'Linkage', 'Linkage', 0, 0, NULL, 3, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('350', 'a', 'Price', 'Price', 1, 0, NULL, 3, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('350', 'b', 'Form of issue', 'Form of issue', 1, 0, NULL, 3, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -1997,7 +1997,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('610', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 6, '', '', '', 0, -5, '', '', '', NULL), ('610', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, '', 6, '', 'CORPO_NAME', '', NULL, 0, '', '', '', NULL), ('610', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, '', 6, '', '', '', NULL, 0, '', '', '', NULL), - ('610', 'c', 'Location of meeting', 'Location of meeting', 0, 0, '', 6, '', '', '', NULL, -1, '', '', '', NULL), + ('610', 'c', 'Location of meeting', 'Location of meeting', 1, 0, '', 6, '', '', '', NULL, -1, '', '', '', NULL), ('610', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, '', 6, '', '', '', NULL, -1, '', '', '', NULL), ('610', 'e', 'Relator term', 'Relator term', 1, 0, '', 6, '', '', '', NULL, -6, '', '', '', NULL), ('610', 'f', 'Date of a work', 'Date of a work', 0, 0, '', 6, '', '', '', NULL, -6, '', '', '', NULL), @@ -2026,7 +2026,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('611', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 6, '', '', '', 0, -5, '', '', '', NULL), ('611', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, NULL, 6, NULL, 'MEETI_NAME', '', NULL, -1, '', '', '', NULL), ('611', 'b', 'Number (BK CF MP MU SE VM MX) [OBSOLETE]', 'Number (BK CF MP MU SE VM MX) [OBSOLETE]', 1, 0, NULL, -1, NULL, NULL, '', NULL, -6, '', '', '', NULL), - ('611', 'c', 'Location of meeting', 'Location of meeting', 0, 0, NULL, 6, NULL, NULL, '', NULL, -1, '', '', '', NULL), + ('611', 'c', 'Location of meeting', 'Location of meeting', 1, 0, NULL, 6, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('611', 'd', 'Date of meeting', 'Date of meeting', 0, 0, NULL, 6, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('611', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, NULL, 6, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('611', 'f', 'Date of a work', 'Date of a work', 0, 0, NULL, 6, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -2386,7 +2386,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('710', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 7, '', '', '', 0, -5, '', '', '', NULL), ('710', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, '', 7, '', 'CORPO_NAME', '', NULL, 0, '', '', '', NULL), ('710', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, '', 7, '', '', '', NULL, 0, '', '', '', NULL), - ('710', 'c', 'Location of meeting', 'Location of meeting', 0, 0, '', 7, '', '', '', NULL, -1, '', '', '', NULL), + ('710', 'c', 'Location of meeting', 'Location of meeting', 1, 0, '', 7, '', '', '', NULL, -1, '', '', '', NULL), ('710', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, '', 7, '', '', '', NULL, -1, '', '', '', NULL), ('710', 'e', 'Relator term', 'Relator term', 1, 0, '', 7, '', '', '', NULL, 0, '', '', '', NULL), ('710', 'f', 'Date of a work', 'Date of a work', 0, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), @@ -2413,7 +2413,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('711', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 7, '', '', '', 0, -5, '', '', '', NULL), ('711', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, NULL, 7, NULL, 'MEETI_NAME', '', NULL, 0, '', '', '', NULL), ('711', 'b', 'Number (BK CF MP MU SE VM MX) [OBSOLETE]', 'Number (BK CF MP MU SE VM MX) [OBSOLETE]', 0, 0, NULL, 7, NULL, NULL, '', NULL, -6, '', '', '', NULL), - ('711', 'c', 'Location of meeting', 'Location of meeting', 0, 0, NULL, 7, NULL, NULL, '', NULL, 0, '', '', '', NULL), + ('711', 'c', 'Location of meeting', 'Location of meeting', 1, 0, NULL, 7, NULL, NULL, '', NULL, 0, '', '', '', NULL), ('711', 'd', 'Date of meeting', 'Date of meeting', 0, 0, NULL, 7, NULL, NULL, '', NULL, 0, '', '', '', NULL), ('711', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, NULL, 7, NULL, NULL, '', NULL, 0, '', '', '', NULL), ('711', 'f', 'Date of a work', 'Date of a work', 0, 0, NULL, 7, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -3050,7 +3050,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('810', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, '', '', '', NULL), ('810', 'a', 'Corporate name or jurisdiction name as entry element', 'Corporate name or jurisdiction name as entry element', 0, 0, '', 8, '', 'CORPO_NAME', '', NULL, -1, '', '', '', NULL), ('810', 'b', 'Subordinate unit', 'Subordinate unit', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), - ('810', 'c', 'Location of meeting', 'Location of meeting', 0, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), + ('810', 'c', 'Location of meeting', 'Location of meeting', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('810', 'd', 'Date of meeting or treaty signing', 'Date of meeting or treaty signing', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('810', 'e', 'Relator term', 'Relator term', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('810', 'f', 'Date of a work', 'Date of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), @@ -3079,7 +3079,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('811', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, '', '', '', NULL), ('811', 'a', 'Meeting name or jurisdiction name as entry element', 'Meeting name or jurisdiction name as entry element', 0, 0, NULL, 8, NULL, 'MEETI_NAME', '', NULL, -1, '', '', '', NULL), ('811', 'b', 'Number (BK CF MP MU SE VM MX) [OBSOLETE]', 'Number (BK CF MP MU SE VM MX) [OBSOLETE]', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), - ('811', 'c', 'Location of meeting', 'Location of meeting', 0, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), + ('811', 'c', 'Location of meeting', 'Location of meeting', 1, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('811', 'd', 'Date of meeting', 'Date of meeting', 0, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('811', 'e', 'Subordinate unit', 'Subordinate unit', 1, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('811', 'f', 'Date of a work', 'Date of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index aae80f1..f1e8184 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8776,6 +8776,18 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + if ( C4::Context->preference('marcflavour') eq 'MARC21' ) { + $dbh->do("UPDATE marc_subfield_structure SET liblibrarian = 'Encoded bitrate', libopac = 'Encoded bitrate' WHERE tagfield = '347' AND tagsubfield = 'f'"); + $dbh->do("UPDATE marc_subfield_structure SET repeatable = 1 WHERE tagfield IN ('110','111','610','611','710','711','810','811') AND tagsubfield = 'c'"); + $dbh->do("UPDATE auth_subfield_structure SET repeatable = 1 WHERE tagfield IN ('110','111','410','411','510','511','710','711') AND tagsubfield = 'c'"); + print "Upgrade to $DBversion done (Bug 12435 - Update MARC21 frameworks to Update No. 18 (April 2014))\n"; + } + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt index e79ca0b..76a4070 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt @@ -7800,11 +7800,11 @@ function RedrawChoices(typ){ [% END %] \ [% IF ( f4q ) %] \ \ [% ELSE %] \ \ [% END %] \ [% IF ( f4s ) %] \ -- 1.7.2.5