From eed620c773e3c48fdec656ae7b61e09352a94946 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9rick?= Date: Mon, 20 Jan 2014 11:04:52 -0500 Subject: [PATCH] Bug 11961 - Add a "Z39.50 search" button to the authority creation and modification pages. This button lets you replace existing authorities using a Z39.50 search. http://bugs.koha-community.org/show_bug.cgi?id=11961 Signed-off-by: Nicole C. Engard All tests pass Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- C4/Breeding.pm | 4 ++- authorities/authorities.pl | 23 ++++++++++++++ cataloguing/z3950_auth_search.pl | 3 ++ .../prog/en/includes/authorities-toolbar.inc | 8 ++++- .../en/modules/authorities/authorities.tt | 31 +++++++++++++++++++ .../modules/cataloguing/z3950_auth_search.tt | 30 +++++++++++------- 6 files changed, 86 insertions(+), 13 deletions(-) diff --git a/C4/Breeding.pm b/C4/Breeding.pm index 7bd95fb9f3..b5a47178ea 100644 --- a/C4/Breeding.pm +++ b/C4/Breeding.pm @@ -520,6 +520,7 @@ sub Z3950SearchAuth { my $subject= $pars->{subject}; my $subjectsubdiv= $pars->{subjectsubdiv}; my $srchany= $pars->{srchany}; + my $authid= $pars->{authid}; my $show_next = 0; my $total_pages = 0; @@ -672,11 +673,12 @@ sub Z3950SearchAuth { $row_data{server} = $servername[$k]; $row_data{breedingid} = $breedingid; $row_data{heading} = $heading; + $row_data{authid} = $authid; $row_data{heading_code} = $heading_authtype_code; push( @breeding_loop, \%row_data ); } else { - push(@breeding_loop,{'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1}); + push(@breeding_loop,{'server'=>$servername[$k],'title'=>join(': ',$oConnection[$k]->error_x()),'breedingid'=>-1,'authid'=>-1}); } } } #if $numresults diff --git a/authorities/authorities.pl b/authorities/authorities.pl index e610e7fcf4..3ea3680402 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -323,6 +323,27 @@ sub CreateKey { return int(rand(1000000)); } +=item GetMandatoryFieldZ3950 + + This function return an hashref which containts all mandatory field + to search with z3950 server. + +=cut + +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', + }; +} + sub build_tabs { my ( $template, $record, $dbh, $encoding,$input ) = @_; @@ -562,6 +583,8 @@ my ($template, $loggedinuser, $cookie) $template->param(nonav => $nonav,index=>$myindex,authtypecode=>$authtypecode,breedingid=>$breedingid,); $tagslib = GetTagsLabels(1,$authtypecode); +$mandatory_z3950 = GetMandatoryFieldZ3950($authtypecode); + my $record=-1; my $encoding=""; if (($authid) && !($breedingid)){ diff --git a/cataloguing/z3950_auth_search.pl b/cataloguing/z3950_auth_search.pl index 806b387179..8ea4f41204 100755 --- a/cataloguing/z3950_auth_search.pl +++ b/cataloguing/z3950_auth_search.pl @@ -29,6 +29,7 @@ use C4::Koha; my $input = new CGI; my $dbh = C4::Context->dbh; my $error = $input->param('error'); +my $authid = $input->param('authid') || 0; my $nameany = $input->param('nameany'); my $authorany = $input->param('authorany'); my $authorcorp = $input->param('authorcorp'); @@ -61,6 +62,7 @@ $template->param( subject => $subject, subjectsubdiv => $subjectsubdiv, srchany => $srchany, + authid => $authid, ); if ( $op ne "do_search" ) { @@ -97,6 +99,7 @@ my $pars= { subject => $subject, subjectsubdiv => $subjectsubdiv, srchany => $srchany, + authid => $authid, }; Z3950SearchAuth($pars, $template); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index 203e9a08fb..b460cdc314 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -7,7 +7,13 @@ }); $("#z3950submit").click(function(){ - window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl","z3950search",'width=800,height=500,location=yes,toolbar=no,scrollbars=yes,resize=yes'); + [% IF ( authid ) %] + if (confirm(_("Please note that this Z39.50 search could replace the current record."))){ + window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid %]","z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes'); + } + [% ELSE %] + window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl","z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes'); + [% END %] return false; }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index ea47100b3c..693b61eab4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -17,8 +17,36 @@ $("#f").submit(); } }); + $("#z3950submit").click(function(){ + if (confirm(_("Please note that this Z39.50 search could replace the current record."))){ + var strQuery = GetZ3950Terms(); + if(strQuery){ + window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes'); + } + } + return false; + }); }); +/** + * check if z3950 mandatories are set or not + */ +function GetZ3950Terms(){ + var strQuery="&authtypecode="+document.forms['f'].authtypecode.value; + var mandatories = new Array(); + var mandatories_label = new Array(); + [% FOREACH BIG_LOO IN BIG_LOOP %][% FOREACH innerloo IN BIG_LOO.innerloop %][% FOREACH subfield_loo IN innerloo.subfield_loop %][% IF ( subfield_loo.z3950_mandatory ) %]mandatories.push("[% subfield_loo.id %]"); + mandatories_label.push("[% subfield_loo.z3950_mandatory %]");[% END %][% END %][% END %][% END %] + + for(var i=0,len=mandatories.length; i
Save
+
+ Z39.50 search +
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 6ef6136e25..c53e938ae8 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 @@ -7,8 +7,8 @@ [% INCLUDE 'datatables.inc' %]