From f180615b0f2f75fb195fa40ce215806c65da904c Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Mon, 7 Jan 2013 19:10:56 -0300 Subject: [PATCH] Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15 This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields Leader18 c and i is fixed on Bug 9357 Added missing/renamed fields on 007 Options 'o' and 'q' already present on 006 and 008, fixing spaces and removing unnecessary descriptions. To test: 1) Catalog/edit a record 2) On 007 value builder, check missing values on 008, BKS, check for example 33- Literary form, i- Letters has a description 3) Apply the patch 4) Clean your browser cache 5) On 007 value builder, new values are present On 008/6 descriptions are absent Signed-off-by: Galen Charlton Signed-off-by: Katrin Fischer Works as described. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 67dae3abd4bbd5394c62eaeccfa67d9c0220a627) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 75b662028ae825bb2db4801132bb23707af7db53) Signed-off-by: Chris Cormack --- .../value_builder/marc21_field_006.xml | 198 ++++++------ .../value_builder/marc21_field_007.tt | 301 +++++++++++++++++- .../value_builder/marc21_field_008.xml | 292 ++++++++--------- 3 files changed, 544 insertions(+), 247 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml index e6cf2f55d7..8613a3c1c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml @@ -1,5 +1,5 @@ - + a @@ -51,25 +51,25 @@ # - 2 + 2 5 6 - a + a b c - d + d e f g - i + i j k - l - m - n - o + l + m + n + o p - q + q r s t @@ -77,14 +77,14 @@ v w y - z + z | # a c - f + f i l m @@ -117,9 +117,9 @@ e f h - i - j - m + i + j + m p s u @@ -136,7 +136,7 @@ - m + m @@ -158,10 +158,10 @@ | - + a b - c + c d e f @@ -179,7 +179,7 @@ # a c - f + f i l m @@ -197,7 +197,7 @@ f - # + # a b c @@ -207,14 +207,14 @@ g i j - k + k m z |||| ## - aa + aa ab ac ad @@ -226,49 +226,49 @@ ap au az - ba + ba bb bc bd - be - bf - bg + be + bf + bg bh - bi - bj + bi + bj bk bl bo - br + br bs bu bz ca - cb + cb cc ce cp cu cz - da - db - dc + da + db + dc dd de - df - dg + df + dg dh - dl + dl zz | a - b - c + b + c d - e + e f g u @@ -280,7 +280,7 @@ # a c - f + f i l m @@ -296,11 +296,11 @@ b c d - f - o - q + f + o + q r - s + s | @@ -335,12 +335,12 @@ an bd bg - bl - bt + bl + bt ca cb cc - cg + cg ch cl cn @@ -356,13 +356,13 @@ fg fl fm - ft + ft gm hy jz mc md - mi + mi mo mp mr @@ -372,7 +372,7 @@ nc nn op - or + or ov pg pm @@ -382,18 +382,18 @@ ps pt pv - rc + rc rd rg - ri + ri rp - rq + rq sd sg - sn + sn sp st - su + su sy tc tl @@ -449,11 +449,11 @@ b c d - f - o - q + f + o + q r - s + s | @@ -473,12 +473,12 @@ z | - + # a b c - d + d e f g @@ -511,7 +511,7 @@ - s + s # @@ -537,7 +537,7 @@ n - r + r u x | @@ -560,10 +560,10 @@ c d e - f - o + f + o q - s + s | @@ -572,28 +572,28 @@ b c d - f - o + f + o q r - s + s | # 5 6 - a + a b c - d + d e f g h - i + i k - l + l m n o @@ -602,7 +602,7 @@ r s t - u + u v w y @@ -613,17 +613,17 @@ # 5 6 - a + a b c - d + d e f g h - i + i k - l + l m n o @@ -642,7 +642,7 @@ # a c - f + f i l m @@ -659,7 +659,7 @@ - # + # a b c @@ -668,18 +668,18 @@ f g h - i - j + i + j k - l + l u z | - 0 - 1 - 2 + 0 + 1 + 2 | @@ -690,7 +690,7 @@ o r - + 000 001-999 nnn @@ -715,7 +715,7 @@ # a c - f + f i l m @@ -731,19 +731,19 @@ b c d - f - o - q + f + o + q r - s + s | - a - b + a + b c - d + d f g i @@ -754,7 +754,7 @@ o p q - r + r s t v @@ -783,11 +783,11 @@ b c d - f - o + f + o q r - s + s | 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 62377885dd..b5d22fa413 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 @@ -362,6 +362,15 @@ function RedrawChoices(typ){ _("g- Textiles") + ' \ [% END %] \ + [% IF ( f4i ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f4j ) %] \ \ [% END %] \ + [% IF ( f4l ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f4n ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f4p ) %] \ \ [% END %] \ + [% IF ( f4v ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f4w ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f4y ) %] \ \ [% END %] \ + [% IF ( f1d ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f1e ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f1f ) %] \ \ [% END %] \ + [% IF ( f1k ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f1m ) %] \ \ [% END %] \ + [% IF ( f4i ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f4l ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f4n ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f4p ) %] \ \ [% END %] \ + [% IF ( f4v ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f4w ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f4z ) %] \ \ [% ELSE %] \ \ [% END %] \ [% IF ( f1o ) %] \ @@ -3456,6 +3573,24 @@ function RedrawChoices(typ){ _("g- Microopaque") + ' \ [% END %] \ + [% IF ( f1h ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ + [% IF ( f1j ) %] \ + \ + [% ELSE %] \ + \ + [% END %] \ [% IF ( f1u ) %] \