[Koha-cvs] CVS: koha/search.marc search.pl,1.23,1.24

[Paul POULAIN]

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21762/search.marc

Modified Files:
        search.pl 
Log Message:
synch'ing 2.2 and head

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/search.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** search.pl   3 Feb 2005 20:48:22 -0000       1.23
--- search.pl   4 May 2005 09:04:52 -0000       1.24
***************
*** 120,123 ****
--- 120,124 ----
        $resultsperpage = 19 if(!defined $resultsperpage);
        my $orderby = $query->param('orderby');
+       my $desc_or_asc = $query->param('desc_or_asc');
  
        # builds tag and subfield arrays
***************
*** 139,144 ****
        my ($results,$total) = catalogsearch($dbh, 
address@hidden,address@hidden,
                                                                                
address@hidden, address@hidden, address@hidden,
!                                                                               
$startfrom*$resultsperpage, $resultsperpage,$orderby);
! 
        ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => 
"search.marc/result.tmpl",
--- 140,149 ----
        my ($results,$total) = catalogsearch($dbh, 
address@hidden,address@hidden,
                                                                                
address@hidden, address@hidden, address@hidden,
!                                                                               
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
!       if ($total == 1) {
!        # if only 1 answer, jump directly to the biblio
!            print 
$query->redirect("/cgi-bin/koha/MARCdetail.pl?bib="address@hidden>{biblionumber});
!                exit
!       }
        ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => 
"search.marc/result.tmpl",