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

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/12/13 19:46:41

Modified files:
	C4             : BookShelves.pm 

Log message:
	Some bug fixing.

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

Patches:
Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.15.8.6
retrieving revision 1.15.8.7
diff -u -b -r1.15.8.6 -r1.15.8.7
--- BookShelves.pm	11 Dec 2006 17:10:06 -0000	1.15.8.6
+++ BookShelves.pm	13 Dec 2006 19:46:41 -0000	1.15.8.7
@@ -3,7 +3,7 @@
 
 package C4::BookShelves;
 
-# $Id: BookShelves.pm,v 1.15.8.6 2006/12/11 17:10:06 toins Exp $
+# $Id: BookShelves.pm,v 1.15.8.7 2006/12/13 19:46:41 hdl 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.6 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.15.8.7 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -100,14 +100,14 @@
     my ( $owner, $mincategory ) = @_;
 
     my $query = qq(
-        SELECT bookshelf.shelfnumber, bookshelf.shelfname,owner,surname,firstname,category,
+        SELECT bookshelf.shelfnumber, bookshelf.shelfname,owner,surname,firstname,bookshelf.category,
                count(shelfcontents.itemnumber) as count
         FROM   bookshelf
             LEFT JOIN   shelfcontents ON bookshelf.shelfnumber = shelfcontents.shelfnumber
             LEFT JOIN   borrowers ON bookshelf.owner = borrowers.borrowernumber
         WHERE  owner=? OR category>=?
         GROUP BY bookshelf.shelfnumber
-        ORDER BY shelfname
+        ORDER BY bookshelf.category, bookshelf.shelfname, borrowers.firstname, borrowers.surname
     );
     my $sth = $dbh->prepare($query);
     $sth->execute( $owner, $mincategory );
@@ -124,8 +124,8 @@
         $shelflist{$shelfnumber}->{'count'}     = $count;
         $shelflist{$shelfnumber}->{'category'}  = $category;
         $shelflist{$shelfnumber}->{'owner'}     = $owner;
-        $shelflist{$shelfnumber}->{surname}     = $surname;
-        $shelflist{$shelfnumber}->{firstname}   = $firstname;
+        $shelflist{$shelfnumber}->{'surname'}     = $surname;
+        $shelflist{$shelfnumber}->{'firstname'}   = $firstname;
     }
     return ( \%shelflist );
 }
@@ -179,6 +179,7 @@
     while ( my ($itemnumber) = $sth->fetchrow ) {
         $sth2->execute($itemnumber);
         my $item = $sth2->fetchrow_hashref;
+        $item->{'itemnumber'}=$itemnumber;
         push( @itemlist, $item );
     }
     return ( \@itemlist );
@@ -416,6 +417,9 @@
 
 #
 # $Log: BookShelves.pm,v $
+# Revision 1.15.8.7  2006/12/13 19:46:41  hdl
+# Some bug fixing.
+#
 # Revision 1.15.8.6  2006/12/11 17:10:06  toins
 # fixing some bugs on bookshelves.
 #