Bug 3602: Fixes a log error for opac-search.pl if expanded_options is not defined.
[koha.git] / opac / opac-search.pl
index 0145b3c..74f8fe5 100755 (executable)
 #!/usr/bin/perl
-use strict;
-require Exporter;
-
-use C4::Auth;
-use C4::Interface::CGI::Output;
+# Script to perform searching
+# Mostly copied from search.pl, see POD there
+use strict;            # always use
+use warnings;
+## STEP 1. Load things that are used in both search page and
+# results page and decide which template to load, operations 
+# to perform, etc.
+## load Koha modules
 use C4::Context;
-use CGI;
-use C4::Database;
-use HTML::Template;
-use C4::SearchMarc;
-use C4::Acquisition;
-use C4::Biblio;
-my @spsuggest; # the array for holding suggestions
-my $suggest;   # a flag to be set (if there are suggestions it's 1)
-my $firstbiblionumber; # needed for directly sending user to first item
-# use C4::Search;
-my $totalresults;
-
-my $itemtypelist;
-my $brancheslist;
-my $categorylist;
-my $subcategorylist;
-my $mediatypelist;
-# added by Gavin 
-my $totalresults;
-
-my $dbh=C4::Context->dbh;
-my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
-$sth->execute;
-while (my ($description,$itemtype) = $sth->fetchrow) {
-    $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
+use C4::Output;
+use C4::Auth qw(:DEFAULT get_session);
+use C4::Search;
+use C4::Biblio;  # GetBiblioData
+use C4::Koha;
+use C4::Tags qw(get_tags);
+use POSIX qw(ceil floor strftime);
+use C4::Branch; # GetBranches
+
+# create a new CGI object
+# FIXME: no_undef_params needs to be tested
+use CGI qw('-no_undef_params');
+my $cgi = new CGI;
+
+BEGIN {
+       if (C4::Context->preference('BakerTaylorEnabled')) {
+               require C4::External::BakerTaylor;
+               import C4::External::BakerTaylor qw(&image_url &link_url);
+       }
 }
-my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
-$sth->execute;
-while (my ($description,$subcategorycode) = $sth->fetchrow) {
-    $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
+
+my ($template,$borrowernumber,$cookie);
+
+# decide which template to use
+my $template_name;
+my $template_type = 'basic';
+my @params = $cgi->param("limit");
+
+my $format = $cgi->param("format") || '';
+my $build_grouped_results = C4::Context->preference('OPACGroupResults');
+if ($format =~ /(rss|atom|opensearchdescription)/) {
+       $template_name = 'opac-opensearch.tmpl';
 }
-my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
-$sth->execute;
-while (my ($description,$mediatypecode) = $sth->fetchrow) {
-    $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
+elsif ($build_grouped_results) {
+    $template_name = 'opac-results-grouped.tmpl';
 }
-my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
-$sth->execute;
-while (my ($description,$categorycode) = $sth->fetchrow) {
-    $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
+elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) {
+       $template_name = 'opac-results.tmpl';
 }
-my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
-$sth->execute;
+else {
+    $template_name = 'opac-advsearch.tmpl';
+    $template_type = 'advsearch';
+}
+# load the template
+($template, $borrowernumber, $cookie) = get_template_and_user({
+    template_name => $template_name,
+    query => $cgi,
+    type => "opac",
+    authnotrequired => 1,
+    }
+);
 
-while (my ($branchname,$branchcode) = $sth->fetchrow) {
-    $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
+if ($format eq 'rss2' or $format eq 'opensearchdescription' or $format eq 'atom') {
+       $template->param($format => 1);
+    $template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime)) if ($format eq 'atom'); 
+    # FIXME - the timestamp is a hack - the biblio update timestamp should be used for each
+    # entry, but not sure if that's worth an extra database query for each bib
 }
-my $query = new CGI;
-my $op = $query->param("op");
-my $type=$query->param('type');
-my $avail=$query->param('avail');
-my $itemtypesstring=$query->param("itemtypesstring");
-$itemtypesstring =~s/"//g;
-my @itemtypes = split ( /\|/, $itemtypesstring);
-my $branchesstring=$query->param("branchesstring");
-$branchesstring =~s/"//g;
-my @branches = split (/\|/, $branchesstring);
-
-my $startfrom=$query->param('startfrom');
-$startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
-my $resultsperpage;
-my $searchdesc;
-
-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');
-
-       for (my $i=0;$i<=$#marclist;$i++) {
-               if ($searchdesc) { # don't put the and_or on the 1st search term
-                       $searchdesc .= $and_or[$i]." ".$excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
-               } else {
-                       $searchdesc = $excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
-               }
+if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
+    $template->param('UNIMARC' => 1);
+}
+elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
+    $template->param('usmarc' => 1);
+}
+$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+
+if (C4::Context->preference('BakerTaylorEnabled')) {
+       $template->param(
+               BakerTaylorEnabled  => 1,
+               BakerTaylorImageURL => &image_url(),
+               BakerTaylorLinkURL  => &link_url(),
+               BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
+       );
+}
+if (C4::Context->preference('TagsEnabled')) {
+       $template->param(TagsEnabled => 1);
+       foreach (qw(TagsShowOnList TagsInputOnList)) {
+               C4::Context->preference($_) and $template->param($_ => 1);
        }
-  if ($itemtypesstring ne ''){
-    $searchdesc .= 'filtered by itemtypes ';
-    $searchdesc .= join(" ",@itemtypes)
-  }
-
-  if ($branchesstring ne ''){
-    $searchdesc .= ' in branches ';
-    $searchdesc .= join(" ",@branches)
-  }
-  if ($avail ne ''){
-    $searchdesc .= '. Only available items shown.'
-  }
-       $resultsperpage= $query->param('resultsperpage');
-       $resultsperpage = 19 if(!defined $resultsperpage);
-       my $orderby = $query->param('orderby');
-       my $desc_or_asc = $query->param('desc_or_asc');
-       # builds tag and subfield arrays
-       my @tags;
-
-       foreach my $marc (@marclist) {
-               if ($marc) {
-                       my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marc,'');
-                       if ($tag) {
-                               push @tags,$dbh->quote("$tag$subfield");
-                       } else {
-                               push @tags, $dbh->quote(substr($marc,0,4));
-                       }
-               } else {
-                       push @tags, "";
-               }
+}
+
+## URI Re-Writing
+# Deprecated, but preserved because it's interesting :-)
+# The same thing can be accomplished with mod_rewrite in
+# a more elegant way
+#                  
+#my $rewrite_flag;
+#my $uri = $cgi->url(-base => 1);
+#my $relative_url = $cgi->url(-relative=>1);
+#$uri.="/".$relative_url."?";
+#warn "URI:$uri";
+#my @cgi_params_list = $cgi->param();
+#my $url_params = $cgi->Vars;
+#
+#for my $each_param_set (@cgi_params_list) {
+#    $uri.= join "",  map "\&$each_param_set=".$_, split("\0",$url_params->{$each_param_set}) if $url_params->{$each_param_set};
+#}
+#warn "New URI:$uri";
+# Only re-write a URI if there are params or if it already hasn't been re-written
+#unless (($cgi->param('r')) || (!$cgi->param()) ) {
+#    print $cgi->redirect(     -uri=>$uri."&r=1",
+#                            -cookie => $cookie);
+#    exit;
+#}
+
+# load the branches
+my $mybranch = ( C4::Context->preference('SearchMyLibraryFirst') && C4::Context->userenv && C4::Context->userenv->{branch} ) ? C4::Context->userenv->{branch} : '';
+my $branches = GetBranches();   # used later in *getRecords, probably should be internalized by those functions after caching in C4::Branch is established
+$template->param(
+    branchloop       => GetBranchesLoop($mybranch, 0),
+    searchdomainloop => GetBranchCategories(undef,'searchdomain'),
+);
+
+# load the Type stuff
+my $itemtypes = GetItemTypes;
+# the index parameter is different for item-level itemtypes
+my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+my @itemtypesloop;
+my $selected=1;
+my $cnt;
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
+
+if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+       foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+           my %row =(  number=>$cnt++,
+               ccl => $itype_or_itemtype,
+                code => $thisitemtype,
+                selected => $selected,
+                description => $itemtypes->{$thisitemtype}->{'description'},
+                count5 => $cnt % 4,
+                imageurl=> getitemtypeimagelocation( 'opac', $itemtypes->{$thisitemtype}->{'imageurl'} ),
+            );
+       $selected = 0; # set to zero after first pass through
+       push @itemtypesloop, \%row;
        }
-       findseealso($dbh,\@tags);
-    my $sqlstring;
-    my $extratables;
-    if ($itemtypesstring ne ''){
-        $sqlstring = 'and (biblioitems.itemtype IN (';
-        my $itemtypeloop=0;
-        foreach my $itemtype (@itemtypes){
-            if ($itemtype ne ''){
-                if ($itemtypeloop != 0){
-                    $sqlstring .=','
-                }
-                $sqlstring .= '"'.$itemtype.'"';
-                $itemtypeloop++;
-            }
+} else {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+       for my $thisitemtype (@$advsearchtypes) {
+           my %row =(
+                   number=>$cnt++,
+                   ccl => $advanced_search_types,
+                   code => $thisitemtype->{authorised_value},
+                   selected => $selected,
+                   description => $thisitemtype->{'lib'},
+                   count5 => $cnt % 4,
+                   imageurl=> getitemtypeimagelocation( 'opac', $thisitemtype->{'imageurl'} ),
+               );
+           push @itemtypesloop, \%row;
+       }
+}
+$template->param(itemtypeloop => \@itemtypesloop);
+
+# # load the itypes (Called item types in the template -- just authorized values for searching)
+# my ($itypecount,@itype_loop) = GetCcodes();
+# $template->param(itypeloop=>\@itype_loop,);
+
+# The following should only be loaded if we're bringing up the advanced search template
+if ( $template_type eq 'advsearch' ) {
+
+    # load the servers (used for searching -- to do federated searching, etc.)
+    my $primary_servers_loop;# = displayPrimaryServers();
+    $template->param(outer_servers_loop =>  $primary_servers_loop,);
+    
+    my $secondary_servers_loop;# = displaySecondaryServers();
+    $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
+
+    # set the default sorting
+    my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') 
+        if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
+    $template->param($default_sort_by => 1);
+
+    # determine what to display next to the search boxes (ie, boolean option
+    # shouldn't appear on the first one, scan indexes should, adding a new
+    # box should only appear on the last, etc.
+    my @search_boxes_array;
+    my $search_boxes_count = C4::Context->preference("OPACAdvSearchInputCount") || 3;
+    for (my $i=1;$i<=$search_boxes_count;$i++) {
+        # if it's the first one, don't display boolean option, but show scan indexes
+        if ($i==1) {
+            push @search_boxes_array,
+                {
+                scan_index => 1,
+                };
+        
         }
-        $sqlstring .= '))'
-    }
-    if ($branchesstring ne ''){
-        $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
-        my $branchesloop=0;
-        $extratables = ',items';
-        foreach my $branch (@branches){
-            if ($branch ne ''){
-                if ($branchesloop != 0){
-                    $sqlstring .=','
-                }
-                $sqlstring .= '"'.$branch.'"';
-                $branchesloop++;
-            }
+        # if it's the last one, show the 'add field' box
+        elsif ($i==$search_boxes_count) {
+            push @search_boxes_array,
+                {
+                boolean => 1,
+                add_field => 1,
+                };
         }
-        $sqlstring .= '))'
+        else {
+            push @search_boxes_array,
+                {
+                boolean => 1,
+                };
+        }
+
     }
-  if ($avail){
-       $extratables .= ',items,issues,reserves';
-    $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
-  }
-       my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
-                                                                               \@excluding, \@operator, \@value,
-                                                                               $startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring, $extratables);
-       if ($total ==1) {
-       if (C4::Context->preference("BiblioDefaultView") eq "normal") {
-            print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=".@$results[0]->{biblionumber});
-       } elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
-            print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
-       } else {
-            print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
-       }
-       exit;
-       }
-       ($template, $loggedinuser, $cookie)
-               = get_template_and_user({template_name => "opac-searchresults.tmpl",
-                               query => $query,
-                               type => 'opac',
-                               authnotrequired => 1,
-                               debug => 1,
-                               });
-
-       # multi page display gestion
-       my $displaynext=0;
-       my $displayprev=$startfrom;
-       if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
-               $displaynext = 1;
-       }
+    $template->param(uc(C4::Context->preference("marcflavour")) => 1,   # we already did this for UNIMARC
+                                         advsearch => 1,
+                      search_boxes_loop => \@search_boxes_array);
 
-       my @field_data = ();
-
-### Added by JF
-## This next does a number of things:
-# 1. It allows you to track all the searches made for stats, etc.
-# 2. It fixes the 'searchdesc' variable problem by introducing
-#         a. 'searchterms' which comes out as 'Keyword: neal stephenson'
-#         b. 'phraseorterm' which comes out as 'neal stephenson'
-#      both of these are useful for differen purposes ... I use searchterms
-#      for display purposes and phraseorterm for passing the search terms
-#      to an external source through a url (like a database search)
-# 3. It provides the variables necessary for the spellchecking (look below for
-#      how this is done
-# 4.
-$totalresults = $total;
-
-## This formats the 'search results' string and populates
-## the 'OPLIN' variable as well as the 'spellcheck' variable
-## with appropriate values based on the user's search input
-
-my $searchterms; #returned in place of searchdesc for 'results for search'
-                 # as a string (can format if need be)
-
-my @spphrases;
-my $phraseorterm;
-my %searchtypehash = ( # used only for the searchterms string formation
-                        # and for spellcheck string
-        '0' => 'keyword',
-        '1' => 'title',
-        '2' => 'author',
-        '3' => 'subject',
-        '4' => 'series',
-        '5' => 'format',
-        );
-
-my @searchterm = $query->param('value');
-
-for (my $i=0; $i <= $#searchterm; $i++) {
-        my $searchtype = $searchtypehash{$i};
-        push @spphrases, $searchterm[$i];
-        if ($searchterms) { #don't put and in again
-                if ($searchterm[$i]) {
-                $phraseorterm.=$searchterm[$i];
-                $searchterms.=" AND ".$searchtype." : \'".$searchterm[$i]."\'";
-                }
-        } else {
-                if ($searchterm[$i]) {
-                $phraseorterm.=$searchterm[$i];
-                $searchterms.=$searchtype.": \'".$searchterm[$i]."\'";
-                }
+# use the global setting by default
+       if ( C4::Context->preference("expandedSearchOption") == 1 ) {
+               $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
+       }
+       # but let the user override it
+       if (defined $cgi->param('expanded_options')) {
+           if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
+           $template->param( expanded_options => $cgi->param('expanded_options'));
+           }
         }
+    output_html_with_http_headers $cgi, $cookie, $template->output;
+    exit;
 }
 
-# Spellchecck stuff ... needs to use above scheme but must change
-# cgi script first
-my $phrases = $query->param('value');
-#my $searchterms = $query->param('value');
-# warn "here is searchterms:".$searchterms;
-
-# FIXME: should be obvious ;-)
-#foreach my $phrases (@spphrases) {
-$phrases =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
-$phrases =~ s/(\Athe |\Aa |\Aan |)//g;
-my $spchkphraseorterm = $phraseorterm;
-        $spchkphraseorterm =~ tr/A-Z/a-z/;
-        $spchkphraseorterm =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
-        $spchkphraseorterm =~s/(\Aand-or |\Aand\/or |\Aanon |\Aan |\Aa |\Abut |\Aby |\Ade |\Ader |\Adr |\Adu|et |\Afor |\Afrom |\Ain |\Ainto |\Ait |\Amy |\Anot |\Aon |\Aor |\Aper |\Apt |\Aspp |\Ato |\Avs |\Awith |\Athe )/ /g;
-        $spchkphraseorterm =~s/( and-or | and\/or | anon | an | a | but | by | de | der | dr | du|et | for | from | in | into | it | my | not | on | or | per | pt | spp | to | vs | with | the )/ /g;
-        $spchkphraseorterm =~s/  / /g;
-my $resultcount = $total;
-my $ipaddress = $query->remote_host();
-#
+### OK, if we're this far, we're performing an actual search
 
-if (
-#need to create a table to record the search info
-#...FIXME: add the script name that creates the table
-# 
-my $dbhpop=DBI->connect("DBI:mysql:demosuggest:localhost","auth","YourPass")) {
-
-# insert the search info query
-my $insertpop = "INSERT INTO phrase_log(phr_phrase,phr_resultcount,phr_ip) VALUES(?,?,?)";
-
-# grab spelling suggestions query
-my $getsugg = "SELECT display FROM spellcheck WHERE strcmp(soundex(suggestion), soundex(?)) = 0 order by soundex(suggestion) limit 0,5";
-
-#get spelling suggestions when there are no results
-if ($resultcount eq 0) {
-        my $sthgetsugg=$dbhpop->prepare($getsugg);
-        $sthgetsugg->execute($spchkphraseorterm);
-        while (my ($spsuggestion)=$sthgetsugg->fetchrow_array) {
-#               warn "==>$spsuggestion";
-                #push @spsuggest, +{ spsuggestion => $spsuggestion };
-                my %line;
-                $line{spsuggestion} = $spsuggestion;
-                push @spsuggest,\%line;
-                $suggest = 1;
-        }
-#       warn "==>".$#spsuggest;
-        $sthgetsugg->finish;
+# Fetch the paramater list as a hash in scalar context:
+#  * returns paramater list as tied hash ref
+#  * we can edit the values by changing the key
+#  * multivalued CGI paramaters are returned as a packaged string separated by "\0" (null)
+my $params = $cgi->Vars;
+my $tag;
+$tag = $params->{tag} if $params->{tag};
+
+# Params that can have more than one value
+# sort by is used to sort the query
+# in theory can have more than one but generally there's just one
+my @sort_by;
+my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') 
+    if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
+
+@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
+$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
+foreach my $sort (@sort_by) {
+    $template->param($sort => 1);   # FIXME: security hole.  can set any TMPL_VAR here
+}
+$template->param('sort_by' => $sort_by[0]);
+
+# Use the servers defined, or just search our local catalog(default)
+my @servers;
+@servers = split("\0",$params->{'server'}) if $params->{'server'};
+unless (@servers) {
+    #FIXME: this should be handled using Context.pm
+    @servers = ("biblioserver");
+    # @servers = C4::Context->config("biblioserver");
 }
-# end of spelling suggestions
 
-my $sthpop=$dbhpop->prepare($insertpop);
+# operators include boolean and proximity operators and are used
+# to evaluate multiple operands
+my @operators;
+@operators = split("\0",$params->{'op'}) if $params->{'op'};
 
-#$sthpop->execute($phrases,$resultcount,$ipaddress);
-$sthpop->finish;
+# indexes are query qualifiers, like 'title', 'author', etc. They
+# can be single or multiple parameters separated by comma: kw,right-Truncation 
+my @indexes = exists($params->{'idx'}) ? split("\0",$params->{'idx'}) : ();
+
+# if a simple index (only one)  display the index used in the top search box
+if ($indexes[0] && !$indexes[1]) {
+    $template->param("ms_".$indexes[0] => 1);
 }
-#
-### end of tracking stuff  --  jmf at kados dot org
-#
-$template->param(suggest => $suggest );
-$template->param( SPELL_SUGGEST => \@spsuggest );
-$template->param( searchterms => $searchterms );
-$template->param( phraseorterm => $phraseorterm );
-#warn "here's the search terms: ".$searchterms;
-#
-### end of spelling suggestions
-### /Added by JF
-
-       for(my $i = 0 ; $i <= $#marclist ; $i++)
-       {
-               push @field_data, { term => "marclist", val=>$marclist[$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] };
-       }
+# an operand can be a single term, a phrase, or a complete ccl query
+my @operands;
+@operands = split("\0",$params->{'q'}) if $params->{'q'};
 
-       my @numbers = ();
-
-       if ($total>$resultsperpage)
-       {
-               for (my $i=1; $i<$total/$resultsperpage+1; $i++)
-               {
-                       if ($i<16)
-                       {
-                       my $highlight=0;
-                       ($startfrom==($i-1)) && ($highlight=1);
-                       push @numbers, { number => $i,
-                                       highlight => $highlight ,
-                                       searchdata=> \@field_data,
-                                       startfrom => ($i-1)};
-                       }
-       }
-       }
+# if a simple search, display the value in the search box
+if ($operands[0] && !$operands[1]) {
+    $template->param(ms_value => $operands[0]);
+}
 
-       my $from = $startfrom*$resultsperpage+1;
-       my $to;
+# limits are use to limit to results to a pre-defined category such as branch or language
+my @limits;
+@limits = split("\0",$params->{'limit'}) if $params->{'limit'};
 
-       if($total < (($startfrom+1)*$resultsperpage))
-       {
-               $to = $total;
-       } else {
-               $to = (($startfrom+1)*$resultsperpage);
-       }
-       my $defaultview = 'BiblioDefaultView'.C4::Context->preference('BiblioDefaultView');
-       $template->param(results => $results,
-                                                       startfrom=> $startfrom,
-                                                       displaynext=> $displaynext,
-                                                       displayprev=> $displayprev,
-                                                       resultsperpage => $resultsperpage,
-                                                       orderby => $orderby,
-                                                       startfromnext => $startfrom+1,
-                                                       startfromprev => $startfrom-1,
-                                                       searchdata=>\@field_data,
-                                                       total=>$total,
-                                                       from=>$from,
-                                                       to=>$to,
-                                                       numbers=>\@numbers,
-                                                       searchdesc=> $searchdesc,
-                                                       $defaultview => 1,
-                                                       suggestion => C4::Context->preference("suggestion"),
-                                                       virtualshelves => C4::Context->preference("virtualshelves"),
-                itemtypelist => $itemtypelist,
-              subcategorylist => $subcategorylist,
-              brancheslist => $brancheslist,
-              categorylist => $categorylist,
-              mediatypelist => $mediatypelist,
-              itemtypesstring => $itemtypesstring,
-              avail => $avail,
-                                                       );
+if($params->{'multibranchlimit'}) {
+push @limits, join(" or ", map { "branch: $_ "}  @{GetBranchesInCategory($params->{'multibranchlimit'})}) ;
+}
+
+my $available;
+foreach my $limit(@limits) {
+    if ($limit =~/available/) {
+        $available = 1;
+    }
+}
+$template->param(available => $available);
+
+# append year limits if they exist
+if ($params->{'limit-yr'}) {
+    if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) {
+        my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'});
+        push @limits, "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2";
+    }
+    elsif ($params->{'limit-yr'} =~ /\d{4}/) {
+        push @limits, "yr,st-numeric=$params->{'limit-yr'}";
+    }
+    else {
+        #FIXME: Should return a error to the user, incorect date format specified
+    }
+}
+
+# Params that can only have one value
+my $scan = $params->{'scan'};
+my $count = C4::Context->preference('OPACnumSearchResults') || 20;
+my $results_per_page = $params->{'count'} || $count;
+my $offset = $params->{'offset'} || 0;
+my $page = $cgi->param('page') || 1;
+$offset = ($page-1)*$results_per_page if $page>1;
+my $hits;
+my $expanded_facet = $params->{'expand'};
+
+# Define some global variables
+my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type);
+
+my @results;
+
+## I. BUILD THE QUERY
+( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by);
 
+sub _input_cgi_parse ($) { 
+    my @elements;
+    for my $this_cgi ( split('&',shift) ) {
+        next unless $this_cgi;
+        $this_cgi =~ /(.*?)=(.*)/;
+        push @elements, { input_name => $1, input_value => $2 };
+    }
+    return @elements;
+}
+
+## parse the query_cgi string and put it into a form suitable for <input>s
+my @query_inputs = _input_cgi_parse($query_cgi);
+$template->param ( QUERY_INPUTS => \@query_inputs );
+
+## parse the limit_cgi string and put it into a form suitable for <input>s
+my @limit_inputs = $limit_cgi ? _input_cgi_parse($limit_cgi) : ();
+
+# add OPAC 'hidelostitems'
+if (C4::Context->preference('hidelostitems') == 1) {
+    # either lost ge 0 or no value in the lost register
+    $query ="($query) and ( (lost,st-numeric <= 0) or ( allrecords,AlwaysMatches='' not lost,AlwaysMatches='') )";
+}
+
+# add OPAC suppression - requires at least one item indexed with Suppress
+if (C4::Context->preference('OpacSuppression')) {
+    $query = "($query) not Suppress=1";
+}
+
+$template->param ( LIMIT_INPUTS => \@limit_inputs );
+
+## II. DO THE SEARCH AND GET THE RESULTS
+my $total = 0; # the total results for the whole set
+my $facets; # this object stores the faceted results that display on the left-hand of the results page
+my @results_array;
+my $results_hashref;
+
+if ($tag) {
+       $query_cgi = "tag=" .$tag . "&" . $query_cgi;
+       my $taglist = get_tags({term=>$tag, approved=>1});
+       $results_hashref->{biblioserver}->{hits} = scalar (@$taglist);
+       my @biblist  = (map {GetBiblioData($_->{biblionumber})} @$taglist);
+       my @marclist = (map {$_->{marc}} @biblist );
+       $DEBUG and printf STDERR "taglist (%s biblionumber)\nmarclist (%s records)\n", scalar(@$taglist), scalar(@marclist);
+       $results_hashref->{biblioserver}->{RECORDS} = \@marclist;
+       # FIXME: tag search and standard search should work together, not exclusively
+       # FIXME: No facets for tags search.
+}
+elsif (C4::Context->preference('NoZebra')) {
+    eval {
+        ($error, $results_hashref, $facets) = NZgetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
+    };
+} elsif ($build_grouped_results) {
+    eval {
+        ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
+    };
 } else {
-       ($template, $loggedinuser, $cookie)
-               = get_template_and_user({template_name => "opac-search.tmpl",
-                                       query => $query,
-                                       type => "opac",
-                                       authnotrequired => 1,
-                               });
-       
-       
-       $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
-       $sth->execute;
-       my  @itemtype;
-       my %itemtypes;
-       push @itemtype, "";
-       $itemtypes{''} = "";
-       while (my ($value,$lib) = $sth->fetchrow_array) {
-               push @itemtype, $value;
-               $itemtypes{$value}=$lib;
-       }
-       
-       my $CGIitemtype=CGI::scrolling_list( -name     => 'value',
-                               -values   => \@itemtype,
-                               -labels   => \%itemtypes,
-                               -size     => 1,
-                               -multiple => 0 );
-       $sth->finish;
-       
-       my @branches;
-       my @select_branch;
-       my %select_branches;
-       my ($count2,@branches)=branches();
-       push @select_branch, "";
-       $select_branches{''} = "";
-       for (my $i=0;$i<$count2;$i++){
-               push @select_branch, $branches[$i]->{'branchcode'};#
-               $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
+    eval {
+        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
+    };
+}
+# use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref);
+if ($@ || $error) {
+    $template->param(query_error => $error.$@);
+    output_html_with_http_headers $cgi, $cookie, $template->output;
+    exit;
+}
+
+# At this point, each server has given us a result set
+# now we build that set for template display
+my @sup_results_array;
+for (my $i=0;$i<=@servers;$i++) {
+    my $server = $servers[$i];
+    if ($server =~/biblioserver/) { # this is the local bibliographic server
+        $hits = $results_hashref->{$server}->{"hits"};
+        my $page = $cgi->param('page') || 0;
+        my @newresults;
+        if ($build_grouped_results) {
+            foreach my $group (@{ $results_hashref->{$server}->{"GROUPS"} }) {
+                # because pazGetRecords handles retieving only the records
+                # we want as specified by $offset and $results_per_page,
+                # we need to set the offset parameter of searchResults to 0
+                my @group_results = searchResults( $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
+                                                   @{ $group->{"RECORDS"} });
+                push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
+            }
+        } else {
+            @newresults = searchResults( $query_desc,$hits,$results_per_page,$offset,$scan,@{$results_hashref->{$server}->{"RECORDS"}});
+        }
+               my $tag_quantity;
+               if (C4::Context->preference('TagsEnabled') and
+                       $tag_quantity = C4::Context->preference('TagsShowOnList')) {
+                       foreach (@newresults) {
+                               my $bibnum = $_->{biblionumber} or next;
+                               $_->{itemsissued} = CountItemsIssued( $bibnum );
+                               $_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, approved=>1, 'sort'=>'-weight',
+                                                                               limit=>$tag_quantity });
+                       }
+               }
+               foreach (@newresults) {
+                       $_->{'coins'} = GetCOinSBiblio($_->{'biblionumber'});
+                       my $clean = $_->{isbn} or next;
+                       unless (
+                               $clean =~ /\b(\d{13})\b/ or
+                               $clean =~ /\b(\d{10})\b/ or 
+                               $clean =~ /\b(\d{9}X)\b/i
+                       ) {
+                               next;
+                       }
+                       $_ ->{'clean_isbn'} = $1;
+               }
+      
+       if ($results_hashref->{$server}->{"hits"}){
+           $total = $total + $results_hashref->{$server}->{"hits"};
        }
-       my $CGIbranch=CGI::scrolling_list( -name     => 'value',
-                               -values   => \@select_branch,
-                               -labels   => \%select_branches,
-                               -size     => 1,
-                               -multiple => 0 );
-       $sth->finish;
-    
-       $template->param(itemtypelist => $itemtypelist,
-                                       CGIitemtype => $CGIitemtype,
-                                       CGIbranch => $CGIbranch,
-                                       suggestion => C4::Context->preference("suggestion"),
-                                       virtualshelves => C4::Context->preference("virtualshelves"),
-       );
+        ## If there's just one result, redirect to the detail page
+        if ($total == 1) {         
+            my $biblionumber=$newresults[0]->{biblionumber};
+            if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {
+                print $cgi->redirect("/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=$biblionumber");
+            } elsif  (C4::Context->preference('BiblioDefaultView') eq 'marc') {
+                print $cgi->redirect("/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=$biblionumber");
+            } else {
+                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
+            } 
+            exit;
+        }
+        if ($hits) {
+            $template->param(total => $hits);
+            my $limit_cgi_not_availablity = $limit_cgi;
+            $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity;
+            $template->param(limit_cgi_not_availablity => $limit_cgi_not_availablity);
+            $template->param(limit_cgi => $limit_cgi);
+            $template->param(query_cgi => $query_cgi);
+            $template->param(query_desc => $query_desc);
+            $template->param(limit_desc => $limit_desc);
+            if ($query_desc || $limit_desc) {
+                $template->param(searchdesc => 1);
+            }
+            $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
+            $template->param(results_per_page =>  $results_per_page);
+            $template->param(SEARCH_RESULTS => \@newresults,
+                                OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay") eq "itemdetails"?1:0),
+                            );
+            ## Build the page numbers on the bottom of the page
+            my @page_numbers;
+            # total number of pages there will be
+            my $pages = ceil($hits / $results_per_page);
+            # default page number
+            my $current_page_number = 1;
+            $current_page_number = ($offset / $results_per_page + 1) if $offset;
+            my $previous_page_offset = $offset - $results_per_page unless ($offset - $results_per_page <0);
+            my $next_page_offset = $offset + $results_per_page;
+            # If we're within the first 10 pages, keep it simple
+            #warn "current page:".$current_page_number;
+            if ($current_page_number < 10) {
+                # just show the first 10 pages
+                # Loop through the pages
+                my $pages_to_show = 10;
+                $pages_to_show = $pages if $pages<10;
+                for ($i=1; $i<=$pages_to_show;$i++) {
+                    # the offset for this page
+                    my $this_offset = (($i*$results_per_page)-$results_per_page);
+                    # the page number for this page
+                    my $this_page_number = $i;
+                    # it should only be highlighted if it's the current page
+                    my $highlight = 1 if ($this_page_number == $current_page_number);
+                    # put it in the array
+                    push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
+                                
+                }
+                        
+            }
+            # now, show twenty pages, with the current one smack in the middle
+            else {
+                for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) {
+                    my $this_offset = ((($i-9)*$results_per_page)-$results_per_page);
+                    my $this_page_number = $i-9;
+                    my $highlight = 1 if ($this_page_number == $current_page_number);
+                    if ($this_page_number <= $pages) {
+                        push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
+                    }
+                }
+                        
+            }
+            $template->param(   PAGE_NUMBERS => \@page_numbers,
+                                previous_page_offset => $previous_page_offset) unless $pages < 2;
+            $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
+         }
+        # no hits
+        else {
+            $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc);
+        }
+    } # end of the if local
+    # asynchronously search the authority server
+    elsif ($server =~/authorityserver/) { # this is the local authority server
+        my @inner_sup_results_array;
+        for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) {
+            my $marc_record_object = MARC::Record->new_from_usmarc($sup_record);
+            my $title_field = $marc_record_object->field(100);
+             warn "Authority Found: ".$marc_record_object->as_formatted();
+            push @inner_sup_results_array, {
+                'title' => $title_field->subfield('a'),
+                'link' => "&amp;idx=an&amp;q=".$marc_record_object->field('001')->as_string(),
+            };
+        }
+        my $servername = $server;
+        push @sup_results_array, {  servername => $servername,
+                                    inner_sup_results_loop => \@inner_sup_results_array} if @inner_sup_results_array;
+    }
+    # FIXME: can add support for other targets as needed here
+    $template->param(           outer_sup_results_loop => \@sup_results_array);
+} #/end of the for loop
+#$template->param(FEDERATED_RESULTS => \@results_array);
+
+$template->param(
+            #classlist => $classlist,
+            total => $total,
+            opacfacets => 1,
+            facets_loop => $facets,
+            scan => $scan,
+            search_error => $error,
+);
+
+if ($query_desc || $limit_desc) {
+    $template->param(searchdesc => 1);
+}
+
+# VI. BUILD THE TEMPLATE
+# NOTE: not using application/atom+xml or application/rss+xml beccause of Internet Explorer 6;
+# see bug 2078.
+my $content_type = ($cgi->param('format') && $cgi->param('format') =~ /rss|atom/) ? "application/xml" :
+                   "text/html";
+
+# Build drop-down list for 'Add To:' menu...
+my $session = get_session($cgi->cookie("CGISESSID"));
+my @addpubshelves;
+my $pubshelves = $session->param('pubshelves');
+my $barshelves = $session->param('barshelves');
+foreach my $shelf (@$pubshelves) {
+       next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );
+       push (@addpubshelves, $shelf);
 }
-# ADDED BY JF
-if ($totalresults == 1){
-    # if its a barcode search by definition we will only have one result.
-    # And if we have a result
-    # lets jump straight to the detail.pl page
-    print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=$firstbiblionumber");
+
+if (@addpubshelves) {
+       $template->param( addpubshelves     => scalar (@addpubshelves));
+       $template->param( addpubshelvesloop => \@addpubshelves);
 }
-else {
-  output_html_with_http_headers $query, $cookie, $template->output;
+
+if (defined $barshelves) {
+       $template->param( addbarshelves     => scalar (@$barshelves));
+       $template->param( addbarshelvesloop => $barshelves);
 }
+
+my $content_type = ($format eq 'rss' or $format eq 'atom') ? $format : 'html';
+
+output_html_with_http_headers $cgi, $cookie, $template->output, $content_type;