From b056933a366c46e16d92d36ee3976fa647f31186 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Fri, 4 May 2018 19:49:07 -0300 Subject: [PATCH] Bug 20710: Update MARC21 frameworks to Update 26 (April 2018) This bug add update 26 changes. Update 26 http://www.loc.gov/marc/bibliographic/bdapndxg.html New subfields 377$3, 380$3, 381$3, 383$3, 730$4 Codes Map 007/04 'x' new Map 007/06 'c' renamed No auth changes To test: 1) Apply Bug 19835 2) Apply this patch 3) Reload marc21 bibliografic frameworks, check loads ok 4) Clean your browser cache 5) Edit a new bib record, fire 007 plugin, for Map, 04 position, check new 'x' for Map, 06 position, check renamed 'c' Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- .../mandatory/authorities_normal_marc21.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 7 ++++++- .../cataloguing/value_builder/marc21_field_007.tt | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 5 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 b6886b9492..901561904d 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. 25 (December 2017) +-- Revised to Update No. 26 (April 2018) -- ******************************************************* -- ****************************************************** 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 ac00ff7439..4b77adf23c 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. 25 (December 2017) +-- Revised to Update No. 26 (April 2018) -- ************************************************************* @@ -1486,6 +1486,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('377', '0', 'Authority record control number or standard number', 'Authority record control number or standard number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('377', '1', 'Real World Object URI', 'Real World Object URI', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('377', '2', 'Source', 'Source', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), + ('377', '3', 'Materials specified', 'Materials specified', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('377', '6', 'Linkage', 'Linkage', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('377', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('377', 'a', 'Language code', 'Language code', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), @@ -1493,12 +1494,14 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('380', '0', 'Authority record control number or standard number', 'Authority record control number or standard number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('380', '1', 'Real World Object URI', 'Real World Object URI', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('380', '2', 'Source of term', 'Source of term', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), + ('380', '3', 'Materials specified', 'Materials specified', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('380', '6', 'Linkage', 'Linkage', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('380', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('380', 'a', 'Form of work', 'Form of work', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('381', '0', 'Authority record control number or standard number', 'Authority record control number or standard number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('381', '1', 'Real World Object URI', 'Real World Object URI', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('381', '2', 'Source of term', 'Source of term', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), + ('381', '3', 'Materials specified', 'Materials specified', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('381', '6', 'Linkage', 'Linkage', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('381', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('381', 'a', 'Other distinguishing characteristic', 'Other distinguishing characteristic', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), @@ -1522,6 +1525,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('382', 'v', 'Note', 'Note', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('383', '2', 'Source', 'Source', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('383', '6', 'Linkage', 'Linkage', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), + ('383', '3', 'Materials specified', 'Materials specified', 0, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('383', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('383', 'a', 'Serial number', 'Serial number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), ('383', 'b', 'Opus number', 'Opus number', 1, 0, '', 3, '', '', '', NULL, -6, '', '', '', NULL), @@ -2578,6 +2582,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib ('730', '0', 'Authority record control number or standard number', 'Authority record control number or standard number', 1, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), ('730', '1', 'Real World Object URI', 'Real World Object URI', 1, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), ('730', '3', 'Materials specified', 'Materials specified', 0, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), + ('730', '4', 'Relationship', 'Relationship', 1, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), ('730', '5', 'Institution to which field applies', 'Institution to which field applies', 0, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), ('730', '6', 'Linkage', 'Linkage', 0, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), ('730', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 7, '', '', '', NULL, -6, '', '', '', NULL), 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 bad89fc707..320293d6f5 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 @@ -472,7 +472,16 @@ _("w- Parchment") + ' \ [% END %] \ - [% IF ( f4y ) %] \ + [% IF ( f4x ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f4y ) %] \ \ @@ -582,11 +591,11 @@ [% END %] \ [% IF ( f6c ) %] \ \ [% ELSE %] \ \ [% END %] \ [% IF ( f6d ) %] \ -- 2.39.5