From 3ce98d053a6dd2b84f973ab4797b96b4ab14a4a5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 27 Sep 2016 13:38:34 +0100 Subject: [PATCH] [PASSED QA] Bug 17358: Rename COU with COUNTRY and LAN with LANG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some installer files use COU and LAN instead of COUNTRY and LANG. To uniformise these AVs, it would be good to use the same code. Note that I do not think we should update existing installations Carefully compared code. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- .../en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql | 4 ++-- .../marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql | 6 +++--- .../marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql index b93956b..f93af2c 100644 --- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql +++ b/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql @@ -452,7 +452,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('073', 'd', 'Terms of Availability and/or Price', 'Terms of Availability and/or Price', 0, 0, '', 0, '', '', '', 0, -6, '', '', '', NULL), ('073', 'z', 'Erroneous Number or Code', 'Erroneous Number or Code', 1, 0, '', 0, '', '', '', 0, -6, '', '', '', NULL), ('100', 'a', 'General Processing Data', 'General Processing Data', 0, 0, '', 1, '', '', 'unimarc_field_100.pl', 0, 0, '', '', '', NULL), - ('101', 'a', 'Language of Text, Soundtrack etc.', 'Language of Text, Soundtrack etc.', 1, 0, '', 1, 'LAN', '', '', 0, 0, '', '', '', NULL), + ('101', 'a', 'Language of Text, Soundtrack etc.', 'Language of Text, Soundtrack etc.', 1, 0, '', 1, 'LANG', '', '', 0, 0, '', '', '', NULL), ('101', 'b', 'Language of Intermediate Text When Item is Not Translated from Original', 'Language of Intermediate Text When Item is Not Translated from Original', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'c', 'Language of Original Work', 'Language of Original Work', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'd', 'Language of Summary', 'Language of Summary', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), @@ -462,7 +462,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('101', 'h', 'Language of Libretto, etc.', 'Language of Libretto, etc.', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'i', 'Language of Accompanying Material (Other than Summaries, Abstracts or Librettos)', 'Language of Accompanying Material (Other than Summaries, Abstracts or Librettos)', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'j', 'Language of Subtitles', 'Language of Subtitles', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), - ('102', 'a', 'Country of Publication', 'Country of Publication', 1, 0, '', 1, 'COU', '', '', 0, 0, '', '', '', NULL), + ('102', 'a', 'Country of Publication', 'Country of Publication', 1, 0, '', 1, 'COUNTRY', '', '', 0, 0, '', '', '', NULL), ('102', 'b', 'Locality of Publication', 'Locality of Publication', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('105', 'a', 'Monograph Coded Data', 'Monograph Coded Data', 0, 0, '', 1, '', '', '', 0, 0, '', '', '', NULL), ('106', 'a', 'Textual Material Coded Data Physical Medium Designator', 'Textual Material Coded Data Physical Medium Designator', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), diff --git a/installer/data/mysql/es-ES/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/es-ES/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql index ea630bb..2aedc4a 100644 --- a/installer/data/mysql/es-ES/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql +++ b/installer/data/mysql/es-ES/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql @@ -357,7 +357,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('071', 'a', 'Publisher\'s Number (Sound Recordings and Music)', 'Publisher\'s Number (Sound Recordings and Music)', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL), ('071', 'b', 'Source', 'Source', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL), ('100', 'a', 'General Processing Data', 'General Processing Data', 0, 0, '', 1, '', '', 'unimarc_field_100.pl', 0, 0, '', '', '', NULL), - ('101', 'a', 'Language of the Text, Soundtrack, etc.', 'Language of the Text, Soundtrack, etc.', 1, 0, '', 1, 'LAN', '', '', 0, 0, '', '', '', NULL), + ('101', 'a', 'Language of the Text, Soundtrack, etc.', 'Language of the Text, Soundtrack, etc.', 1, 0, '', 1, 'LANG', '', '', 0, 0, '', '', '', NULL), ('101', 'b', 'Language of Intermediate Text when Item is Not Translated from Original', 'Language of Intermediate Text when Item is Not Translated from Original', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'c', 'Language of Original Work', 'Language of Original Work', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'd', 'Language of Summary', 'Language of Summary', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), @@ -367,7 +367,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('101', 'h', 'Language of Libretto, etc.', 'Language of Libretto, etc.', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'i', 'Language of Accompainying MAterial (Other than Summaries, Abstracts or Librettos', 'Language of Accompainying MAterial (Other than Summaries, Abstracts or Librettos', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'j', 'Language of Subtitles', 'Language of Subtitles', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), - ('102', 'a', 'Country of Publication', 'Country of Publication', 1, 0, '', 1, 'COU', '', '', 0, 0, '', '', '', NULL), + ('102', 'a', 'Country of Publication', 'Country of Publication', 1, 0, '', 1, 'COUNTRY', '', '', 0, 0, '', '', '', NULL), ('102', 'b', 'Locality of Publication', 'Locality of Publication', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('105', 'a', 'Monograph Coded Data', 'Monograph Coded Data', 0, 0, '', 1, '', '', '', 0, 0, '', '', '', NULL), ('106', 'a', 'Textual Material Data - Physical Medium Designator', 'Textual Material Data - Physical Medium Designator', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), @@ -1404,4 +1404,4 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` UPDATE `marc_subfield_structure` SET maxlength=24 WHERE tagfield='000'; -UPDATE `marc_subfield_structure` SET maxlength=36 WHERE tagfield='100'; \ No newline at end of file +UPDATE `marc_subfield_structure` SET maxlength=36 WHERE tagfield='100'; diff --git a/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql index f355884..412cc5e 100644 --- a/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql +++ b/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql @@ -420,7 +420,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('071', 'a', 'Publisher\'s Number (Sound Recordings and Music)', 'Publisher\'s Number (Sound Recordings and Music)', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL), ('071', 'b', 'Source', 'Source', 0, 0, '', 0, '', '', '', 0, -5, '', '', '', NULL), ('100', 'a', 'General Processing Data', 'General Processing Data', 0, 0, '', 1, '', '', 'unimarc_field_100.pl', 0, 0, '', '', '', NULL), - ('101', 'a', 'Language of the Text, Soundtrack, etc.', 'Language of the Text, Soundtrack, etc.', 1, 0, '', 1, 'LAN', '', '', 0, 0, '', '', '', NULL), + ('101', 'a', 'Language of the Text, Soundtrack, etc.', 'Language of the Text, Soundtrack, etc.', 1, 0, '', 1, 'LANG', '', '', 0, 0, '', '', '', NULL), ('101', 'b', 'Language of Intermediate Text when Item is Not Translated from Original', 'Language of Intermediate Text when Item is Not Translated from Original', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'c', 'Language of Original Work', 'Language of Original Work', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'd', 'Language of Summary', 'Language of Summary', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), @@ -430,7 +430,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('101', 'h', 'Language of Libretto, etc.', 'Language of Libretto, etc.', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'i', 'Language of Accompainying MAterial (Other than Summaries, Abstracts or Librettos', 'Language of Accompainying MAterial (Other than Summaries, Abstracts or Librettos', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('101', 'j', 'Language of Subtitles', 'Language of Subtitles', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), - ('102', 'a', 'Country of Publication', 'Country of Publication', 1, 0, '', 1, 'COU', '', '', 0, 0, '', '', '', NULL), + ('102', 'a', 'Country of Publication', 'Country of Publication', 1, 0, '', 1, 'COUNTRY', '', '', 0, 0, '', '', '', NULL), ('102', 'b', 'Locality of Publication', 'Locality of Publication', 1, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), ('105', 'a', 'Monograph Coded Data', 'Monograph Coded Data', 0, 0, '', 1, '', '', '', 0, 0, '', '', '', NULL), ('106', 'a', 'Textual Material Data - Physical Medium Designator', 'Textual Material Data - Physical Medium Designator', 0, 0, '', 1, '', '', '', 0, -5, '', '', '', NULL), -- 2.7.4