[Koha-cvs] CVS: koha/C4 BookShelves.pm,1.10,1.11

[MJ Ray]

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

Modified Files:
	BookShelves.pm 
Log Message:
DBI call fix for bug 662

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** BookShelves.pm	5 Feb 2003 10:05:02 -0000	1.10
--- BookShelves.pm	15 Dec 2003 10:57:08 -0000	1.11
***************
*** 97,103 ****
      my %shelflist;
      while (my ($shelfnumber, $shelfname) = $sth->fetchrow) {
! 	my $sti=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=$shelfnumber");
  		# FIXME - Should there be an "order by" in here somewhere?
! 	$sti->execute;
  	my ($count) = $sti->fetchrow;
  	$shelflist{$shelfnumber}->{'shelfname'}=$shelfname;
--- 97,103 ----
      my %shelflist;
      while (my ($shelfnumber, $shelfname) = $sth->fetchrow) {
! 	my $sti=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=?");
  		# FIXME - Should there be an "order by" in here somewhere?
! 	$sti->execute($shelfnumber);
  	my ($count) = $sti->fetchrow;
  	$shelflist{$shelfnumber}->{'shelfname'}=$shelfname;
***************
*** 124,129 ****
      my ($env, $shelfnumber) = @_;
      my @itemlist;
!     my $sth=$dbh->prepare("select itemnumber from shelfcontents where shelfnumber=$shelfnumber order by itemnumber");
!     $sth->execute;
      while (my ($itemnumber) = $sth->fetchrow) {
  	my ($item) = getiteminformation($env, $itemnumber, 0);
--- 124,129 ----
      my ($env, $shelfnumber) = @_;
      my @itemlist;
!     my $sth=$dbh->prepare("select itemnumber from shelfcontents where shelfnumber=? order by itemnumber");
!     $sth->execute($shelfnumber);
      while (my ($itemnumber) = $sth->fetchrow) {
  	my ($item) = getiteminformation($env, $itemnumber, 0);
***************
*** 131,136 ****
      }
      return (\@itemlist);
- 		# FIXME - Wouldn't it be more intuitive to return a list,
- 		# rather than a reference-to-list?
  }
  
--- 131,134 ----
***************
*** 178,183 ****
  sub RemoveFromShelf {
      my ($env, $itemnumber, $shelfnumber) = @_;
!     my $sth=$dbh->prepare("delete from shelfcontents where shelfnumber=$shelfnumber and itemnumber=$itemnumber");
!     $sth->execute;
  }
  
--- 176,181 ----
  sub RemoveFromShelf {
      my ($env, $itemnumber, $shelfnumber) = @_;
!     my $sth=$dbh->prepare("delete from shelfcontents where shelfnumber=? and itemnumber=?");
!     $sth->execute($shelfnumber,$itemnumber);
  }
  
***************
*** 200,211 ****
  sub AddShelf {
      my ($env, $shelfname) = @_;
!     my $q_shelfname=$dbh->quote($shelfname);
!     my $sth=$dbh->prepare("select * from bookshelf where shelfname=$q_shelfname");
!     $sth->execute;
      if ($sth->rows) {
  	return(1, "Shelf \"$shelfname\" already exists");
      } else {
! 	$sth=$dbh->prepare("insert into bookshelf (shelfname) values ($q_shelfname)");
! 	$sth->execute;
  	return (0, "Done");
      }
--- 198,208 ----
  sub AddShelf {
      my ($env, $shelfname) = @_;
!     my $sth=$dbh->prepare("select * from bookshelf where shelfname=?");
! 	$sth->execute($shelfname);
      if ($sth->rows) {
  	return(1, "Shelf \"$shelfname\" already exists");
      } else {
! 	$sth=$dbh->prepare("insert into bookshelf (shelfname) values (?)");
! 	$sth->execute($shelfname);
  	return (0, "Done");
      }
***************
*** 229,240 ****
  sub RemoveShelf {
      my ($env, $shelfnumber) = @_;
!     my $sth=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=$shelfnumber");
!     $sth->execute;
      my ($count)=$sth->fetchrow;
      if ($count) {
  	return (1, "Shelf has $count items on it.  Please remove all items before deleting this shelf.");
      } else {
! 	$sth=$dbh->prepare("delete from bookshelf where shelfnumber=$shelfnumber");
! 	$sth->execute;
  	return (0, "Done");
      }
--- 226,237 ----
  sub RemoveShelf {
      my ($env, $shelfnumber) = @_;
!     my $sth=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=?");
! 	$sth->execute($shelfnumber);
      my ($count)=$sth->fetchrow;
      if ($count) {
  	return (1, "Shelf has $count items on it.  Please remove all items before deleting this shelf.");
      } else {
! 	$sth=$dbh->prepare("delete from bookshelf where shelfnumber=?");
! 	$sth->execute($shelfnumber);
  	return (0, "Done");
      }
***************
*** 247,250 ****
--- 244,250 ----
  #
  # $Log$
+ # Revision 1.11  2003/12/15 10:57:08  slef
+ # DBI call fix for bug 662
+ #
  # Revision 1.10  2003/02/05 10:05:02  acli
  # Converted a few SQL statements to use ? to fix a few strange SQL errors