[Koha-cvs] CVS: koha/acqui newbasket2.pl,1.2,1.3

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv10456/acqui

Modified Files:
        newbasket2.pl 
Log Message:
merging 1.2 and main branches


Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbasket2.pl       7 May 2002 00:09:06 -0000       1.2
--- newbasket2.pl       4 Jul 2002 10:42:31 -0000       1.3
***************
*** 77,86 ****
  
  print center();
- my $count;
- my @results;
  
  
!       ($count,@results)=&CatSearch(\$blah,'loose',\%search,$num,$offset);
! 
  
  print "You searched on ";
--- 77,91 ----
  
  print center();
  
  
!     if ($keyword ne ''){
! #      print "hey";
!       ($count,@results)=KeywordSearch(undef,'intra',\%search,$num,$offset);
!     } elsif ($search{'front'} ne '') {
!     ($count,@results)=FrontSearch(undef,'intra',\%search,$num,$offset);
!     }else {
!       ($count,@results)=CatSearch(undef,'loose',\%search,$num,$offset);
! #            print "hey";
!     }
  
  print "You searched on ";