[Koha-cvs] CVS: koha/C4 Search.pm,1.83,1.84

Paul POULAIN tipaul at users.sourceforge.net
Thu Dec 11 13:56:36 CET 2003


Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv26588/C4

Modified Files:
	Search.pm 
Log Message:
fixing compilation bugs

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** Search.pm	9 Dec 2003 14:47:38 -0000	1.83
--- Search.pm	11 Dec 2003 12:56:34 -0000	1.84
***************
*** 146,150 ****
    my ($bornum)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("select guarantor from borrowers where borrowernumber=?"");
    $sth->execute($bornum);
    my $data=$sth->fetchrow_hashref;
--- 146,150 ----
    my ($bornum)=@_;
    my $dbh = C4::Context->dbh;
!   my $sth=$dbh->prepare("select guarantor from borrowers where borrowernumber=?");
    $sth->execute($bornum);
    my $data=$sth->fetchrow_hashref;
***************
*** 487,491 ****
        my $count=@temp;
        $query.= "and ( itemtype=?";
!       push(@bind,$item[0]);
        for (my $i=1;$i<$count;$i++){
          $query.=" or itemtype=?";
--- 487,491 ----
        my $count=@temp;
        $query.= "and ( itemtype=?";
!       push(@bind,$temp[0]);
        for (my $i=1;$i<$count;$i++){
          $query.=" or itemtype=?";
***************
*** 681,685 ****
    $sth=$dbh->prepare("Select biblionumber from bibliosubject where subject
    like ? group by biblionumber");
!   $sth->execute(%$search->{'keyword'}%);
    while (my $data=$sth->fetchrow_hashref){
      $query="Select * from biblio,biblioitems where
--- 681,685 ----
    $sth=$dbh->prepare("Select biblionumber from bibliosubject where subject
    like ? group by biblionumber");
!   $sth->execute("%".$search->{'keyword'}."%");
    while (my $data=$sth->fetchrow_hashref){
      $query="Select * from biblio,biblioitems where
***************
*** 993,997 ****
  					where
  					(((title like ? or title like ?)";
! 					@bind=("$key[0]%,"% $key[0]%");
  					while ($i<$count){
  						$query .= " and (title like ? or title like ?)";
--- 993,997 ----
  					where
  					(((title like ? or title like ?)";
! 					@bind=("$key[0]%","% $key[0]%");
  					while ($i<$count){
  						$query .= " and (title like ? or title like ?)";
***************
*** 1000,1004 ****
  					}
  					$query.=") or ((subtitle like ? or subtitle like ?)";
! 					push(@bind,"$key[0]%,"% $key[0]%");
  					for ($i=1;$i<$count;$i++){
  						$query.=" and (subtitle like ? or subtitle like ?)";
--- 1000,1004 ----
  					}
  					$query.=") or ((subtitle like ? or subtitle like ?)";
! 					push(@bind,"$key[0]%","% $key[0]%");
  					for ($i=1;$i<$count;$i++){
  						$query.=" and (subtitle like ? or subtitle like ?)";
***************
*** 1006,1010 ****
  					}
  					$query.=") or ((seriestitle like ? or seriestitle like ?)";
! 					push(@bind,"$key[0]%,"% $key[0]%");
  					for ($i=1;$i<$count;$i++){
  						$query.=" and (seriestitle like ? or seriestitle like ?)";
--- 1006,1010 ----
  					}
  					$query.=") or ((seriestitle like ? or seriestitle like ?)";
! 					push(@bind,"$key[0]%","% $key[0]%");
  					for ($i=1;$i<$count;$i++){
  						$query.=" and (seriestitle like ? or seriestitle like ?)";
***************
*** 1012,1016 ****
  					}
  					$query.=") or ((unititle like ? or unititle like ?)";
! 					push(@bind,"$key[0]%,"% $key[0]%");
  					for ($i=1;$i<$count;$i++){
  						$query.=" and (unititle like ? or unititle like ?)";
--- 1012,1016 ----
  					}
  					$query.=") or ((unititle like ? or unititle like ?)";
! 					push(@bind,"$key[0]%","% $key[0]%");
  					for ($i=1;$i<$count;$i++){
  						$query.=" and (unititle like ? or unititle like ?)";
***************
*** 1031,1035 ****
  				my @temp=split(/\|/,$search->{'class'});
  				my $count=@temp;
! 				$query.= " and ( itemtype= ?);
  				@bind=($temp[0]);
  				for (my $i=1;$i<$count;$i++){
--- 1031,1035 ----
  				my @temp=split(/\|/,$search->{'class'});
  				my $count=@temp;
! 				$query.= " and ( itemtype= ?)";
  				@bind=($temp[0]);
  				for (my $i=1;$i<$count;$i++){
***************
*** 1054,1058 ****
  					$query="select * from biblioitems,biblio
  				where biblio.biblionumber=biblioitems.biblionumber
! 				and biblioitems.illus like ?;
  					@bind=("%".$search->{'illustrator'}."%");
  			} elsif ($search->{'publisher'} ne ''){
--- 1054,1058 ----
  					$query="select * from biblioitems,biblio
  				where biblio.biblionumber=biblioitems.biblionumber
! 				and biblioitems.illus like ?";
  					@bind=("%".$search->{'illustrator'}."%");
  			} elsif ($search->{'publisher'} ne ''){
***************
*** 1177,1181 ****
  		if ($search->{'publisher'} ne ''){
  			$query.= " and (publishercode like ?)";
! 			push(@bind,"%$search->{'publisher'}%";
  		}
  		my $sti=$dbh->prepare($query);
--- 1177,1181 ----
  		if ($search->{'publisher'} ne ''){
  			$query.= " and (publishercode like ?)";
! 			push(@bind,"%$search->{'publisher'}%");
  		}
  		my $sti=$dbh->prepare($query);
***************
*** 1862,1869 ****
    my $sth;
    if ($bornum eq ''){
!     $sth=$dbh->prepare("Select * from borrowers where cardnumber=?";
      $sth->execute($cardnumber);
    } else {
!     $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?";
    $sth->execute($bornum);
    }
--- 1862,1869 ----
    my $sth;
    if ($bornum eq ''){
!     $sth=$dbh->prepare("Select * from borrowers where cardnumber=?");
      $sth->execute($cardnumber);
    } else {
!     $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
    $sth->execute($bornum);
    }
***************
*** 2454,2458 ****
  	my $dbh   = C4::Context->dbh;
  	my $count = 0;
! 	my $query, at bind;
  	my $sth;
  	my @results;
--- 2454,2458 ----
  	my $dbh   = C4::Context->dbh;
  	my $count = 0;
! 	my ($query, at bind);
  	my $sth;
  	my @results;
***************
*** 2618,2622 ****
      my $dbh   = C4::Context->dbh;
      my $count = 0;
!     my $query, at bind;
      my $sth;
      my @results;
--- 2618,2622 ----
      my $dbh   = C4::Context->dbh;
      my $count = 0;
!     my ($query, at bind);
      my $sth;
      my @results;





More information about the Koha-cvs mailing list