[Koha-devel] CVS: koha/C4 Search.pm,1.17,1.18

[Chris Cormack]

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

Modified Files:
	Search.pm 
Log Message:
Fixing the subject search i broke ;)


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** Search.pm	10 Apr 2002 07:59:28 -0000	1.17
--- Search.pm	10 Apr 2002 09:55:17 -0000	1.18
***************
*** 671,675 ****
    my $subclass;
    my $true=0;
!   if (($dewey, $subclass) = $sti->fetchrow){
      $true=1;
    }
--- 671,675 ----
    my $subclass;
    my $true=0;
!   if (($dewey, $subclass) = $sti->fetchrow || $type eq 'subject'){
      $true=1;
    }
***************
*** 793,797 ****
      $i++;
    }
!   $sth->finish;
    $dbh->disconnect;
    return(@results);
--- 793,810 ----
      $i++;
    }
!  $sth->finish;
!   my $query2="Select * from aqorders where biblionumber=$biblionumber";
!   my $sth2=$dbh->prepare($query2);         
!   $sth2->execute;                                        
!   my $data;
!   my $ocount;
!   if ($data=$sth2->fetchrow_hashref){                   
!     $ocount=$data->{'quantity'} - $data->{'quantityreceived'};                                                  
!     if ($ocount > 0){
!       $results[$i]="$data->{'title'}\t$data->{'barcode'}\t$ocount\tOn Order\t\t$data->{'itemnumber'}\t$data->{'itemtype'}\t\t$data->{'biblioitemnumber'}\t$data->{'volumeddesc'}";
!     }
!   } 
!   $sth2->finish;
! 
    $dbh->disconnect;
    return(@results);
***************
*** 855,861 ****
    my ($bibnum,$type)=@_;
    my $dbh=C4Connect;
!   my $query="Select *,biblio.notes  from biblio,biblioitems,bibliosubtitle where biblio.biblionumber=$bibnum
!   and biblioitems.biblionumber=$bibnum and 
! (bibliosubtitle.biblionumber=$bibnum)"; 
  #  print $query;
    my $sth=$dbh->prepare($query);
--- 868,878 ----
    my ($bibnum,$type)=@_;
    my $dbh=C4Connect;
!   my $query="Select *,biblio.notes  
!   from biblio,biblioitems 
!   left join bibliosubtitle on                                                
!   biblio.biblionumber=bibliosubtitle.biblionumber
!   
!   where biblio.biblionumber=$bibnum
!   and biblioitems.biblionumber=$bibnum"; 
  #  print $query;
    my $sth=$dbh->prepare($query);