[Koha-cvs] CVS: koha/acqui acquire.pl,1.2,1.2.2.1 newbasket2.pl,1.1.1.1,1.1.1.1.2.1 newbiblio.pl,1.2,1.2.2.1 receive.pl,1.1.1.1,1.1.1.1.2.1

[Chris Cormack]

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

Modified Files:
      Tag: rel-1-2
        acquire.pl newbasket2.pl newbiblio.pl receive.pl 
Log Message:
Tidying up more warnings.


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** acquire.pl  12 Mar 2001 23:32:47 -0000      1.2
--- acquire.pl  26 May 2002 09:13:45 -0000      1.2.2.1
***************
*** 191,195 ****
  EOP
  ;
! my ($count2,@bookfund)=bookfunds;                                             
       
  for (my $i=0;$i<$count2;$i++){                                                
       
    print "<option value=$bookfund[$i]->{'bookfundid'}";
--- 191,196 ----
  EOP
  ;
! my @bookfund;
! ($count2,@bookfund)=bookfunds();                                              
      
  for (my $i=0;$i<$count2;$i++){                                                
       
    print "<option value=$bookfund[$i]->{'bookfundid'}";

Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** newbasket2.pl       19 Dec 2000 23:45:56 -0000      1.1.1.1
--- newbasket2.pl       26 May 2002 09:13:45 -0000      1.1.1.1.2.1
***************
*** 25,29 ****
  
  #print $input->dump;
- my $blah;
  my %search;
  #build hash of users input
--- 25,28 ----
***************
*** 69,82 ****
  
  print center();
! my $count;
! my @results;
  
      if ($keyword ne ''){
  #      print "hey";
!       ($count,@results)=&KeywordSearch(\$blah,'intra',\%search,$num,$offset);
      } elsif ($search{'front'} ne '') {
!     ($count,@results)&FrontSearch(\$blah,'intra',\%search,$num,$offset);
      }else {
!       ($count,@results)=&CatSearch(\$blah,'loose',\%search,$num,$offset);
  #            print "hey";
      }
--- 68,80 ----
  
  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";
      }

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** newbiblio.pl        12 Mar 2001 23:32:47 -0000      1.2
--- newbiblio.pl        26 May 2002 09:13:45 -0000      1.2.2.1
***************
*** 188,192 ****
  printend
  ;
! my ($count2,@branches)=branches;
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$branches[$i]->{'branchcode'}";
--- 188,193 ----
  printend
  ;
! my @branches;
! ($count2,@branches)=branches();
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$branches[$i]->{'branchcode'}";
***************
*** 237,242 ****
  printend
  ;
! 
! my ($count2,@bookfund)=bookfunds;
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$bookfund[$i]->{'bookfundid'}";
--- 238,243 ----
  printend
  ;
! my @bookfund;
! ($count2,@bookfund)=bookfunds();
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$bookfund[$i]->{'bookfundid'}";

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** receive.pl  19 Dec 2000 23:45:57 -0000      1.1.1.1
--- receive.pl  26 May 2002 09:13:45 -0000      1.1.1.1.2.1
***************
*** 55,59 ****
  EOP
  ;
! my ($count,@results)=invoice($invoice);
  if ($invoice eq ''){
    ($count,@results)=getallorders($id);
--- 55,60 ----
  EOP
  ;
! my @results;
! ($count,@results)=invoice($invoice);
  if ($invoice eq ''){
    ($count,@results)=getallorders($id);