From b5cc9006c1ad9d37b52a63f70d9b95daddd5ba70 Mon Sep 17 00:00:00 2001 From: simith <simith@inlibro.com> Date: Wed, 13 Aug 2014 15:26:15 -0400 Subject: [PATCH] This patch fix the QA critical error, fix the capitalization and the UNIMARC support. http://bugs.koha-community.org/show_bug.cgi?id=11961 --- 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 7556f64..27d065b 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -351,18 +351,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 aad602d..c5c3021 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 @@ -192,16 +192,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %] [% IF ( show_prevbutton ) %] - <input type="button" name="changepage_prev" value="Previous Page" onclick="$('#current_page').val([% current_page %]-1);$('#page_form').submit();" /> + <input type="button" name="changepage_prev" value="Previous page" onclick="$('#current_page').val([% current_page %]-1);$('#page_form').submit();" /> [% END %] Page [% current_page %] / [% total_pages %] [% IF ( show_nextbutton ) %] - <input type="button" name="changepage_next" value="Next Page" onclick="$('#current_page').val([% current_page %]+1);$('#page_form').submit();" /> + <input type="button" name="changepage_next" value="Next page" onclick="$('#current_page').val([% current_page %]+1);$('#page_form').submit();" /> [% END %] <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" onclick="return validate_goto_page();" value="Go" /> </form> -<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_auth_search.pl"><input type="hidden" name="authid" value="[% authid %]" /><input type="submit" value="Try Another Search"/></form></p> +<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_auth_search.pl"><input type="hidden" name="authid" value="[% authid %]" /><input type="submit" value="Try another search"/></form></p> [% ELSE %] [% IF ( errconn ) %] <div class="dialog alert"> @@ -214,7 +214,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : </div> [% END %] <div class="dialog message">Nothing found.</div> - <p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_auth_search.pl"><input type="hidden" name="authid" value="[% authid %]" /><input type="submit" value="Try Another Search"/></form></p> + <p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_auth_search.pl"><input type="hidden" name="authid" value="[% authid %]" /><input type="submit" value="Try another search"/></form></p> [% END %] [% END %] -- 1.9.1