[Koha-cvs] CVS: koha/C4 Search.pm,1.73,1.74

[Paul POULAIN]

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

Modified Files:
        Search.pm 
Log Message:
fix for 556

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** Search.pm   15 Jul 2003 00:02:49 -0000      1.73
--- Search.pm   6 Aug 2003 12:37:54 -0000       1.74
***************
*** 856,860 ****
  sub CatSearch  {
        my ($env,$type,$search,$num,$offset)address@hidden;
-       warn "type = $type";
        my $dbh = C4::Context->dbh;
        my $query = '';
--- 856,859 ----
***************
*** 1006,1013 ****
                my address@hidden;
                my $i=1;
!               $query="select * from bibliosubject, biblioitems where 
! (bibliosubject.biblionumber = biblioitems.biblionumber) and ( subject like    
        
! '$key[0]%' or subject like '% $key[0]%' or subject like '% $key[0]' or 
subject 
! like '%($key[0])%')";         while ($i<$count){                      
$query.=" and (subject like 
  '$key[$i]%' or subject like '% $key[$i]%'                     or subject like 
'% $key[$i]'
                        or subject like '%($key[$i])%')";
--- 1005,1012 ----
                my address@hidden;
                my $i=1;
!               $query="select * from bibliosubject, biblioitems where
! (bibliosubject.biblionumber = biblioitems.biblionumber) and ( subject like
! '$key[0]%' or subject like '% $key[0]%' or subject like '% $key[0]' or subject
! like '%($key[0])%')";         while ($i<$count){                      
$query.=" and (subject like
  '$key[$i]%' or subject like '% $key[$i]%'                     or subject like 
'% $key[$i]'
                        or subject like '%($key[$i])%')";
***************
*** 1114,1118 ****
                my $publishercode;
                my $bibitemdata;
!               if ($bibitemdata = $sti->fetchrow_hashref() || $type eq 
'subject'){
                        $true=1;
                        $dewey=$bibitemdata->{'dewey'};
--- 1113,1117 ----
                my $publishercode;
                my $bibitemdata;
!               if ($bibitemdata = $sti->fetchrow_hashref()){
                        $true=1;
                        $dewey=$bibitemdata->{'dewey'};
***************
*** 1667,1671 ****
                                                                        and 
returndate is not NULL
                                                                        order 
by returndate desc,timestamp desc";
- warn "$query2";
          $sth2 = $dbh->prepare($query2) || die $dbh->errstr;
          $sth2->execute($data->{'itemnumber'}) || die $sth2->errstr;
--- 1666,1669 ----
***************
*** 1799,1803 ****
  sub borrdata {
    my ($cardnumber,$bornum)address@hidden;
-    warn "bornum $bornum";
    $cardnumber = uc $cardnumber;
    my $dbh = C4::Context->dbh;
--- 1797,1800 ----
***************
*** 2427,2431 ****
                }
        }
-       warn "Q : $query";
        $sth   = $dbh->prepare($query);
        $sth->execute;
--- 2424,2427 ----
***************
*** 2582,2586 ****
                $query .= " and title like ".$dbh->quote($title."%");
        }
-       warn $query;
      $sth   = $dbh->prepare($query);
  
--- 2578,2581 ----