[Koha-cvs] CVS: koha/C4 BookShelves.pm,1.2,1.3

[Steve Tonnesen]

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

Modified Files:
        BookShelves.pm 
Log Message:
Merged in updates from rel-1-2


Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** BookShelves.pm      7 Feb 2001 23:47:43 -0000       1.2
--- BookShelves.pm      2 Jul 2002 17:48:06 -0000       1.3
***************
*** 4,10 ****
  # $Header$
  #
- #
- # Change log is at the bottom of the file
- #
  #requires DBI.pm to be installed
  
--- 4,7 ----
***************
*** 21,30 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &RemoveFromShelf 
&AddShelf &RemoveShelf);
- 
- sub AddShelf {
- }
- 
- sub RemoveShelf {
- }
  %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
                  
--- 18,21 ----
***************
*** 115,123 ****
      $sth->execute;
      if ($sth->rows) {
!       return(0, "Shelf \"$shelfname\" already exists");
      } else {
        $sth=$dbh->prepare("insert into bookshelf (shelfname) values 
($q_shelfname)");
        $sth->execute;
!       return (1, "Done");
      }
  }
--- 106,114 ----
      $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");
      }
  }
***************
*** 129,137 ****
      my ($count)=$sth->fetchrow;
      if ($count) {
!       return (0, "Shelf has $count items on it");
      } else {
        $sth=$dbh->prepare("delete from bookshelf where 
shelfnumber=$shelfnumber");
        $sth->execute;
!       return (1, "Done");
      }
  }
--- 120,128 ----
      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");
      }
  }
***************
*** 143,151 ****
  #
  # $Log$
! # Revision 1.2  2001/02/07 23:47:43  tonnesen
! # Added header and log substition variables
  #
! # Revision 1.1  2001/02/07 20:27:17  tonnesen
! # Start of code to implement virtual bookshelves in Koha.
  #
  #
--- 134,142 ----
  #
  # $Log$
! # Revision 1.3  2002/07/02 17:48:06  tonnesen
! # Merged in updates from rel-1-2
  #
! # Revision 1.2.2.1  2002/06/26 20:46:48  tonnesen
! # Inserting some changes I made locally a while ago.
  #
  #