From 34ae28aac32d5f6972c8247b30be369191370b3e Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 13 Aug 2014 15:26:15 -0400 Subject: [PATCH] [PASSED QA] Bug 11961 - This patch fix the QA critical error, fix the capitalization and the UNIMARC support. http://bugs.koha-community.org/show_bug.cgi?id=11961 Signed-off-by: Aleisha Signed-off-by: Kyle M Hall --- authorities/authorities.pl | 27 +++++++++++-------- .../en/modules/cataloguing/z3950_auth_search.tt | 8 +++--- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/authorities/authorities.pl b/authorities/authorities.pl index 3ea3680..f9a79ad 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -330,18 +330,23 @@ sub CreateKey { =cut -sub GetMandatoryFieldZ3950($){ +sub GetMandatoryFieldZ3950 { my $authtypecode = shift; - - #Tags guessed (see GuessAuthTypeCode from AuthoritiesMarc.pm) - - return { - '100'.'a' => 'authorpersonal', - '110'.'a' => 'authorcorp', - '111'.'a' => 'authormeetingcon', - '130'.'a' => 'uniformtitle', - '150'.'a' => 'topic', - }; + if ( C4::Context->preference('marcflavour') eq 'MARC21' ){ + return { + '100a' => 'authorpersonal', + '110a' => 'authorcorp', + '111a' => 'authormeetingcon', + '130a' => 'uniformtitle', + '150a' => 'topic', + }; + }else{ + return { + '200a' => 'authorpersonal', + '210a' => 'authormeetingcon', #210 in UNIMARC is used for both corporation and meeting + '230a' => 'uniformtitle', + }; + } } sub build_tabs { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index c53e938..c3d9dbf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -191,16 +191,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %] [% IF ( show_prevbutton ) %] - + [% END %] Page [% current_page %] / [% total_pages %] [% IF ( show_nextbutton ) %] - + [% END %]
Go to page : -

+

[% ELSE %] [% IF ( errconn ) %]
@@ -213,7 +213,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% END %]
Nothing found.
-

+

[% END %] [% END %] -- 1.7.2.5