Bug 11961 - This patch fix the QA critical error, fix the capitalization and the...

http://bugs.koha-community.org/show_bug.cgi?id=11961
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 3ea3680..f9a79ad 100755 (executable)
--- 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 (file)
--- 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 ) %]
-            <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">
@@ -213,7 +213,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 %]