[Koha-cvs] CVS: koha/C4 Search.pm,1.31,1.32

[Finlay Thompson]

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

Modified Files:
	Search.pm 
Log Message:

Changed the ItemInfo method. if an items "itemlost" field is 2, the 'duedate' is set to "Very Overdue". If itemlost = 1, duedate is set to "Lost".


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** Search.pm	11 Jul 2002 05:48:01 -0000	1.31
--- Search.pm	31 Jul 2002 01:50:06 -0000	1.32
***************
*** 778,784 ****
      my ($env,$biblionumber,$type) = @_;
      my $dbh   = &C4Connect;
!     my $query = "SELECT * FROM items, biblio, biblioitems
!                   WHERE items.biblionumber = '$biblionumber'
                      AND biblioitems.biblioitemnumber = items.biblioitemnumber
                      AND biblio.biblionumber = items.biblionumber";
    if ($type ne 'intra'){
--- 778,785 ----
      my ($env,$biblionumber,$type) = @_;
      my $dbh   = &C4Connect;
!     my $query = "SELECT * FROM items, biblio, biblioitems, itemtypes
!                   WHERE items.biblionumber = ?
                      AND biblioitems.biblioitemnumber = items.biblioitemnumber
+                     AND biblioitems.itemtype = itemtypes.itemtype
                      AND biblio.biblionumber = items.biblionumber";
    if ($type ne 'intra'){
***************
*** 790,794 ****
      #warn $query;
    my $sth=$dbh->prepare($query);
!   $sth->execute;
    my $i=0;
    my @results;
--- 791,795 ----
      #warn $query;
    my $sth=$dbh->prepare($query);
!   $sth->execute($biblionumber);
    my $i=0;
    my @results;
***************
*** 805,820 ****
        $datedue = "$temp[2]/$temp[1]/$temp[0]";
      }
!     if ($data->{'itemlost'} eq '1' || $data->{'itemlost'} eq '2'){
!         $datedue='Itemlost';
      }
      if ($data->{'wthdrawn'} eq '1'){
!       $datedue="Cancelled";
      }
      if ($datedue eq ''){
!        $datedue="Available";
!        my ($restype,$reserves)=CheckReserves($data->{'itemnumber'});
!        if ($restype){                                
!           $datedue=$restype;
!        }
      }
      $isth->finish;
--- 806,824 ----
        $datedue = "$temp[2]/$temp[1]/$temp[0]";
      }
!     if ($data->{'itemlost'} eq '2'){
!         $datedue='Very Overdue';
!     }
!     if ($data->{'itemlost'} eq '1'){
!         $datedue='Lost';
      }
      if ($data->{'wthdrawn'} eq '1'){
! 	$datedue="Cancelled";
      }
      if ($datedue eq ''){
! 	$datedue="Available";
! 	my ($restype,$reserves)=CheckReserves($data->{'itemnumber'});
! 	if ($restype){
! 	    $datedue=$restype;
! 	}
      }
      $isth->finish;