From 45f423885ab54c7861f001544a004a9d854b9e52 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 21 Feb 2021 10:41:04 -0800 Subject: [PATCH] Bug 27738: Set fallback for unset DefaultCountryField008 to |||, "no attempt to code" Current code intended to set a fallback of xxu, an unknown state in the US, but because the preference is always defined, just sometimes unset, it actually falls back to three spaces, an invalid value. This patch instead uses the fallback value ||| which means no attempt to code. Test plan: 1. Without the patch, verify that the value of the system preference DefaultCountryField008 is empty. 2. Cataloging - New record - Default framework (if you have the Advanced editor enabled, Settings - Switch to basic editor, this only applies to the basic editor) 3. On tab 0, click in the text input for field 008 which fills in default values, then click the Tag editor button at the end of the field 4. In the popup window, verify that the value for 15-17 is shown as ### indicating three spaces 5. Apply patch, repeat the steps above, verify that the value is now ||| Signed-off-by: Martin Renvoize Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit d5e7d37d8a0427f50d31d922df89ba4b16e15c98) Signed-off-by: Fridolin Somers (cherry picked from commit f1837739bbd1aeb65e40a405a7ae674b9eb79792) Signed-off-by: Andrew Fuerste-Henry --- cataloguing/value_builder/marc21_field_008.pl | 3 ++- .../prog/en/modules/admin/preferences/cataloguing.pref | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl index b046042b38..c2b25e91d3 100755 --- a/cataloguing/value_builder/marc21_field_008.pl +++ b/cataloguing/value_builder/marc21_field_008.pl @@ -36,7 +36,8 @@ my $builder = sub { my $lang = C4::Context->preference('DefaultLanguageField008' ); $lang = "eng" unless $lang; $lang = pack("A3", $lang); - my $country = C4::Context->preference('DefaultCountryField008') // "xxu"; + my $country = C4::Context->preference('DefaultCountryField008'); + $country = "|||" unless $country; $country = pack("A3", $country); my $function_name = $params->{id}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index a1053851d0..13dc41c6c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -55,7 +55,7 @@ Cataloging: - - Fill in the default country code for field 008 Range 15-17 of MARC21 - Place of publication, production, or execution. See MARC Code List for Countries - pref: DefaultCountryField008 - - " Empty defaults to xxu for United States." + - " Empty defaults to ||| for No attempt to code." - - Interpret and store MARC records in the - pref: marcflavour -- 2.39.5