[Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.43,1.44

[Waylon Robertson]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10028

Modified Files:
        SearchMarc.pm 
Log Message:
Added necessary tables for search for availablity feature into Catalogsearch. 
Someone needs to speed it up somehow.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** SearchMarc.pm       1 Jun 2005 21:18:39 -0000       1.43
--- SearchMarc.pm       3 Jun 2005 03:58:26 -0000       1.44
***************
*** 277,289 ****
        # Finds the basic results without the NOT requests
        my ($sql_tables, $sql_where1, $sql_where2) = 
create_request($dbh,address@hidden, address@hidden, address@hidden, 
address@hidden);
!   $sql_where1 .=" ". $sqlstring;
        $sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) 
<30" if $orderby =~ "biblio.timestamp";
        my $sth;
        if ($sql_where2) {
!               $sth = $dbh->prepare("select distinct m1.bibid from 
biblio,biblioitems,items,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
!               warn "Q2 : select distinct m1.bibid from 
biblio,biblioitems,items,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
        } else {
!               $sth = $dbh->prepare("select distinct m1.bibid from 
biblio,biblioitems,items,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where1 order by $orderby $desc_or_asc");
!               warn "Q : select distinct m1.bibid from 
biblio,biblioitems,items,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where1 order by $orderby $desc_or_asc";
        }
        $sth->execute();
--- 277,289 ----
        # Finds the basic results without the NOT requests
        my ($sql_tables, $sql_where1, $sql_where2) = 
create_request($dbh,address@hidden, address@hidden, address@hidden, 
address@hidden);
!   $sql_where1 .= $sqlstring;
        $sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) 
<30" if $orderby =~ "biblio.timestamp";
        my $sth;
        if ($sql_where2) {
!               $sth = $dbh->prepare("select distinct m1.bibid from 
biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
!               warn "Q2 : select distinct m1.bibid from 
biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
        } else {
!               $sth = $dbh->prepare("select distinct m1.bibid from 
biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where1 order by $orderby $desc_or_asc");
!               warn "Q : select distinct m1.bibid from 
biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where 
biblio.biblionumber=marc_biblio.biblionumber and 
biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and 
$sql_where1 order by $orderby $desc_or_asc";
        }
        $sth->execute();