[Koha-cvs] koha/C4 BookShelves.pm [rel_3_0]

[paul poulain]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	07/01/25 13:18:15

Modified files:
	C4             : BookShelves.pm 

Log message:
	checking that a bookshelf with the same name AND OWNER does not exist before creating it

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/BookShelves.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.15.8.9&r2=1.15.8.10

Patches:
Index: BookShelves.pm
===================================================================
RCS file: /sources/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.15.8.9
retrieving revision 1.15.8.10
diff -u -b -r1.15.8.9 -r1.15.8.10
--- BookShelves.pm	15 Dec 2006 17:37:52 -0000	1.15.8.9
+++ BookShelves.pm	25 Jan 2007 13:18:15 -0000	1.15.8.10
@@ -3,7 +3,7 @@
 
 package C4::BookShelves;
 
-# $Id: BookShelves.pm,v 1.15.8.9 2006/12/15 17:37:52 toins Exp $
+# $Id: BookShelves.pm,v 1.15.8.10 2007/01/25 13:18:15 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -29,7 +29,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.15.8.9 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.15.8.10 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -210,10 +210,10 @@
     my $query = qq(
         SELECT *
         FROM   bookshelf
-        WHERE  shelfname=?
+        WHERE  shelfname=? AND owner=?
     );
     my $sth = $dbh->prepare($query);
-    $sth->execute($shelfname);
+    $sth->execute($shelfname,$owner);
     if ( $sth->rows ) {
         return (-1);
     }
@@ -422,6 +422,9 @@
 
 #
 # $Log: BookShelves.pm,v $
+# Revision 1.15.8.10  2007/01/25 13:18:15  tipaul
+# checking that a bookshelf with the same name AND OWNER does not exist before creating it
+#
 # Revision 1.15.8.9  2006/12/15 17:37:52  toins
 # removing a function used only once.
 #