[Koha-cvs] CVS: koha/C4 Search.pm,1.48,1.49

[Andrew Arensburger]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv4964

Modified Files:
        Search.pm 
Log Message:
Replaced expressions of the form "$x = $x <op> $y" with "$x <op>= $y".
Thus, $x = $x+2 becomes $x += 2, and so forth.


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** Search.pm   13 Oct 2002 06:10:45 -0000      1.48
--- Search.pm   13 Oct 2002 11:36:09 -0000      1.49
***************
*** 568,573 ****
    (((title like '$key[0]%' or title like '% $key[0]%')";
    while ($i < $count){
!     $query=$query." and (title like '$key[$i]%' or title like '% $key[$i]%')";
!                               # FIXME - .=
      $i++;
    }
--- 568,572 ----
    (((title like '$key[0]%' or title like '% $key[0]%')";
    while ($i < $count){
!     $query .= " and (title like '$key[$i]%' or title like '% $key[$i]%')";
      $i++;
    }
***************
*** 604,608 ****
      or seriestitle like '% new zealand')"
    }
!   $query=$query."))";         # FIXME - .=
    if ($search->{'class'} ne ''){
      my @temp=split(/\|/,$search->{'class'});
--- 603,607 ----
      or seriestitle like '% new zealand')"
    }
!   $query .= "))";
    if ($search->{'class'} ne ''){
      my @temp=split(/\|/,$search->{'class'});
***************
*** 887,898 ****
                 )";
         while ($i < $count){
!            $query=$query." and (
           biblio.author like '$key[$i]%' or biblio.author like '% $key[$i]%' or
           additionalauthors.author like '$key[$i]%' or 
additionalauthors.author like '% $key[$i]%'
           )";
-                               # FIXME - .= <<EOT
             $i++;
         }
!        $query=$query.")";     # FIXME - .=
           if ($search->{'title'} ne ''){
           my @key=split(' ',$search->{'title'});
--- 886,896 ----
                 )";
         while ($i < $count){
!            $query .= " and (
           biblio.author like '$key[$i]%' or biblio.author like '% $key[$i]%' or
           additionalauthors.author like '$key[$i]%' or 
additionalauthors.author like '% $key[$i]%'
           )";
             $i++;
         }
!        $query .= ")";
           if ($search->{'title'} ne ''){
           my @key=split(' ',$search->{'title'});
***************
*** 901,906 ****
           $query.= " and (((title like '$key[0]%' or title like '% $key[0]%' 
or title like '% $key[0]')";
              while ($i<$count){
!             $query=$query." and (title like '$key[$i]%' or title like '% 
$key[$i]%' or title like '% $key[$i]')";
!                               # FIXME - .=
                $i++;
            }
--- 899,903 ----
           $query.= " and (((title like '$key[0]%' or title like '% $key[0]%' 
or title like '% $key[0]')";
              while ($i<$count){
!             $query .= " and (title like '$key[$i]%' or title like '% 
$key[$i]%' or title like '% $key[$i]')";
                $i++;
            }
***************
*** 917,921 ****
                $query.=" and (unititle like '$key[$i]%' or unititle like '% 
$key[$i]%')";
              }
!           $query=$query."))";         # FIXME - .=
           #$query=$query. " and (title like '%$search->{'title'}%'
           #or seriestitle like '%$search->{'title'}%')";
--- 914,918 ----
                $query.=" and (unititle like '$key[$i]%' or unititle like '% 
$key[$i]%')";
              }
!           $query .= "))";
           #$query=$query. " and (title like '%$search->{'title'}%'
           #or seriestitle like '%$search->{'title'}%')";
***************
*** 953,958 ****
            (((title like '$key[0]%' or title like '% $key[0]%' or title like 
'% $key[0]')";
            while ($i<$count){
!             $query=$query." and (title like '$key[$i]%' or title like '% 
$key[$i]%' or title like '% $key[$i]')";
!                                       # FIXME - .=
              $i++;
            }
--- 950,954 ----
            (((title like '$key[0]%' or title like '% $key[0]%' or title like 
'% $key[0]')";
            while ($i<$count){
!             $query .= " and (title like '$key[$i]%' or title like '% 
$key[$i]%' or title like '% $key[$i]')";
              $i++;
            }
***************
*** 969,973 ****
              $query.=" and (unititle like '$key[$i]%' or unititle like '% 
$key[$i]%')";
            }
!           $query=$query."))";         # FIXME - .=
           }
           if ($search->{'abstract'} ne ''){
--- 965,969 ----
              $query.=" and (unititle like '$key[$i]%' or unititle like '% 
$key[$i]%')";
            }
!           $query .= "))";
           }
           if ($search->{'abstract'} ne ''){
***************
*** 1093,1103 ****
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){
!       $query=$query." order by biblio.author,title";  # FIXME - .=
    } else {
!       $query=$query." order by title";                        # FIXME - .=
    }
  } else {
    if ($type eq 'subject'){
!       $query=$query." order by subject";              # FIXME - .=
    }
  }
--- 1089,1099 ----
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){
!       $query .= " order by biblio.author,title";
    } else {
!       $query .= " order by title";
    }
  } else {
    if ($type eq 'subject'){
!       $query .= " order by subject";
    }
  }
***************
*** 1325,1331 ****
      }
      $dewey=~ s/\.$//;
!     $class = $class.$dewey;                   # FIXME - .=
      if ($dewey ne ''){
!       $class = $class.$data->{'subclass'};    # FIXME - .=
      }
   #   
$results[$i]="$data->{'title'}\t$data->{'barcode'}\t$datedue\t$data->{'branchname'}\t$data->{'dewey'}";
--- 1321,1327 ----
      }
      $dewey=~ s/\.$//;
!     $class .= $dewey;
      if ($dewey ne ''){
!       $class .= $data->{'subclass'};
      }
   #   
$results[$i]="$data->{'title'}\t$data->{'barcode'}\t$datedue\t$data->{'branchname'}\t$data->{'dewey'}";
***************
*** 1396,1402 ****
        $dewey =~ s/0+$//;
        my $line = $data->{'biblioitemnumber'}."\t".$data->{'itemtype'};
!       $line = $line."\t$data->{'classification'}\t$dewey";    # FIXME - .=
!       $line = $line."\t$data->{'subclass'}\t$data->{isbn}";   # FIXME - .=
!       $line = $line."\t$data->{'volume'}\t$data->{number}";   # FIXME - .=
        my $isth= $dbh->prepare("select * from items where biblioitemnumber = 
$data->{'biblioitemnumber'}");
        $isth->execute;
--- 1392,1398 ----
        $dewey =~ s/0+$//;
        my $line = $data->{'biblioitemnumber'}."\t".$data->{'itemtype'};
!       $line .= "\t$data->{'classification'}\t$dewey";
!       $line .= "\t$data->{'subclass'}\t$data->{isbn}";
!       $line .= "\t$data->{'volume'}\t$data->{number}";
        my $isth= $dbh->prepare("select * from items where biblioitemnumber = 
$data->{'biblioitemnumber'}");
        $isth->execute;
***************
*** 1404,1413 ****
          my $iline = $idata->{'barcode'}."[".$idata->{'holdingbranch'}."[";
        if ($idata->{'notforloan'} == 1) {
!         $iline = $iline."NFL ";                               # FIXME - .=
        }
        if ($idata->{'itemlost'} == 1) {
!         $iline = $iline."LOST ";                              # FIXME - .=
        }
!         $line = $line."\t$iline";                             # FIXME - .=
        }
        $isth->finish;
--- 1400,1409 ----
          my $iline = $idata->{'barcode'}."[".$idata->{'holdingbranch'}."[";
        if ($idata->{'notforloan'} == 1) {
!         $iline .= "NFL ";
        }
        if ($idata->{'itemlost'} == 1) {
!         $iline .= "LOST ";
        }
!         $line .= "\t$iline";
        }
        $isth->finish;
***************
*** 1997,2001 ****
        $acctlines[$numlines] = $data;
        $numlines++;
!       $total = $total+ $data->{'amountoutstanding'};  # FIXME - +=
     }
     $sth->finish;
--- 1993,1997 ----
        $acctlines[$numlines] = $data;
        $numlines++;
!       $total += $data->{'amountoutstanding'};
     }
     $sth->finish;