Clean up before final commits

[koha.git] / authorities / auth_linker.pl

diff --git a/authorities/auth_linker.pl b/authorities/auth_linker.pl
index 6f495de..9448a36 100644 (file)
--- a/authorities/auth_linker.pl
+++ b/authorities/auth_linker.pl
@@ -19,18 +19,14 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+
 use CGI;
 use C4::Auth;
-use HTML::Template;
 use C4::Context;
 use C4::Search;
-use C4::Auth;
-use C4::Output;
+
 use C4::Interface::CGI::Output;
 use C4::AuthoritiesMarc;
-#use C4::Biblio;
-use C4::Acquisition;
 use C4::Koha; # XXX subfield_is_koha_internal_p
 
 my $query=new CGI;
@@ -60,17 +56,15 @@ foreach my $thisauthtype (keys %$authtypes) {
 
 if ($op eq "do_search") {
        my @marclist = $query->param('marclist');
-       my @and_or = $query->param('and_or');
-       my @excluding = $query->param('excluding');
+       
        my @operator = $query->param('operator');
        my @value = $query->param('value');
 
        $resultsperpage= $query->param('resultsperpage');
-       $resultsperpage = 19 if(!defined $resultsperpage);
+       $resultsperpage = 10 if(!defined $resultsperpage);
+
+       my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode) ;
 
-       my ($results,$total) = authoritysearch($dbh, \@marclist,\@and_or,
-                                                                               \@excluding, \@operator, \@value,
-                                                                               $startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
 
        ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => "authorities/linkresultlist-auth.tmpl",
@@ -92,11 +86,9 @@ if ($op eq "do_search") {
        my @field_data = ();
 
 
-       my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name
+       my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by authoritysearch (mainentry replaced by field name
        for(my $i = 0 ; $i <= $#marclist ; $i++) {
                push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
-               push @field_data, { term => "and_or", val=>$and_or[$i] };
-               push @field_data, { term => "excluding", val=>$excluding[$i] };
                push @field_data, { term => "operator", val=>$operator[$i] };
                push @field_data, { term => "value", val=>$value[$i] };
        }
@@ -132,7 +124,7 @@ if ($op eq "do_search") {
                                                        resultsperpage => $resultsperpage,
                                                        startfromnext => $startfrom+1,
                                                        startfromprev => $startfrom-1,
-                                               index => $index,
+                                                               index => $index,
                                                        searchdata=>\@field_data,
                                                        total=>$total,
                                                        from=>$from,