X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FVirtualShelves.pm;h=b8a5a834b6294b269d277ead48d8abd9e71e4622;hb=65fd1cf419241d1850ed72cdc2a4868e739064e1;hp=6238f791c1bb4c0583379630516c9a1dbf2a43db;hpb=542c54e067e75d6c0f9fa470241541db35c34e02;p=koha.git

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index 6238f791c1..b8a5a834b6 100644
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -27,6 +27,7 @@ use C4::Context;
 use C4::Circulation;
 use C4::Debug;
 use C4::Members;
+require C4::Auth;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
@@ -36,21 +37,18 @@ BEGIN {
 	require Exporter;
 	@ISA    = qw(Exporter);
 	@EXPORT = qw(
-        &GetShelves &GetShelfContents &GetShelf
-		&GetRecentShelves &GetShelvesSummary
-
-        &AddToShelf &AddToShelfFromBiblio &AddShelf
-
-		&SetShelvesLimit
-		&RefreshShelvesSummary
-
-        &ModShelf
-        &ShelfPossibleAction
-        &DelFromShelf &DelShelf
+            &GetShelves &GetShelfContents &GetShelf
+            &AddToShelf &AddToShelfFromBiblio &AddShelf
+            &ModShelf
+            &ShelfPossibleAction
+            &DelFromShelf &DelShelf
 	);
+        @EXPORT_OK = qw(
+            &GetShelvesSummary &GetRecentShelves
+            &RefreshShelvesSummary &SetShelvesLimit
+        );
 }
 
-use C4::Auth qw(get_session);
 
 my $dbh = C4::Context->dbh;
 
@@ -254,7 +252,7 @@ from C4::Circulation.
 
 =cut
 
-sub GetShelfContents ($$;$$) {
+sub GetShelfContents ($;$$$) {
     my ($shelfnumber, $row_count, $offset, $sortfield) = @_;
     my $dbh=C4::Context->dbh();
 	my $sth1 = $dbh->prepare("SELECT count(*) FROM virtualshelfcontents WHERE shelfnumber = ?");
@@ -266,8 +264,8 @@ sub GetShelfContents ($$;$$) {
 		($sortfield) = $sth2->fetchrow_array;
 	}
     my $query =
-       " SELECT vc.biblionumber, vc.shelfnumber, vc.dateadded,
-	   			biblio.*, biblioitems.itemtype, itemtypes.*
+       " SELECT vc.biblionumber, vc.shelfnumber, vc.dateadded, itemtypes.*,
+	   			biblio.*, biblioitems.itemtype, biblioitems.publicationyear
          FROM   virtualshelfcontents vc
 		 LEFT JOIN biblio      ON      vc.biblionumber =      biblio.biblionumber
 		 LEFT JOIN biblioitems ON  biblio.biblionumber = biblioitems.biblionumber
@@ -279,9 +277,11 @@ sub GetShelfContents ($$;$$) {
 		$query .= " DESC " if ($sortfield eq 'copyrightdate');
 		push (@params, $sortfield);
 	}
-	$query .= " LIMIT ?, ? ";
-	push (@params, ($offset ? $offset : 0));
-	push (@params, $row_count);
+    if($row_count){
+	   $query .= " LIMIT ?, ? ";
+	   push (@params, ($offset ? $offset : 0));
+	   push (@params, $row_count);
+    }
     my $sth3 = $dbh->prepare($query);
 	$sth3->execute(@params);
 	return ($sth3->fetchall_arrayref({}), $total);
@@ -546,7 +546,7 @@ This function is used in conjunction with the 'Lists' button in masthead.inc.
 sub RefreshShelvesSummary ($$$) {
 	
 	my ($sessionID, $loggedinuser, $row_count) = @_;
-	my $session = get_session($sessionID);
+	my $session = C4::Auth::get_session($sessionID);
 	my ($total, $totshelves, $barshelves, $pubshelves);
 
 	($barshelves, $totshelves) = GetRecentShelves(1, $row_count, $loggedinuser);