projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleanup Members.pm - minor
[koha.git] / opac / opac-reserve.pl
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 7719ab3..4395f38 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -88,39 +88,14 @@ if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) {
 }
 
 # pass the pickup branch along....
-my $branch = $query->param('branch');
+my $branch = $query->param('branch') || C4::Context->userenv->{branch} || '' ;
+($branches->{$branch}) or $branch = "";     # Confirm branch is real
 $template->param( branch => $branch );
 
-# make sure it's a real branch
-if ( !$branch || !$branches->{$branch} ) {
-    $branch = '';
-}
-$template->param( branchname => $branches->{$branch}->{'branchname'} );
-
 # make branch selection options...
-my @branches;
-my @select_branch;
-my %select_branches;
-
-my @CGIbranchlooparray;
-
-foreach my $branch ( keys %$branches ) {
-    if ($branch) {
-        my %line;
-        $line{branch} = $branches->{$branch}->{'branchname'};
-        $line{value}  = $branch;
-        if ($line{value} eq C4::Context->userenv->{'branch'}) {
-            $line{selected} = 1;
-        }
-        push @CGIbranchlooparray, \%line;
-    }
-}
-@CGIbranchlooparray =
-   sort { $a->{branch} cmp $b->{branch} } @CGIbranchlooparray;
-my $CGIbranchloop = \@CGIbranchlooparray;
+my $CGIbranchloop = GetBranchesLoop($branch);
 $template->param( CGIbranch => $CGIbranchloop );
 
-
 #Debug
 #output_html_with_http_headers($query,$cookie,"<html><head></head><body> @biblionumbers </body></html>\n");
 #exit;
@@ -205,8 +180,8 @@ if ( $query->param('place_reserve') ) {
 
     while (@selectedItems) {
         my $biblioNum = shift(@selectedItems);
-        my $itemNum = shift(@selectedItems);
-        my $branch = shift(@selectedItems); # i.e., branch code, not name
+        my $itemNum   = shift(@selectedItems);
+        my $branch    = shift(@selectedItems); # i.e., branch code, not name
 
         my $singleBranchMode = $template->param('singleBranchMode');
         if ($singleBranchMode) {
@@ -314,7 +289,8 @@ $template->param('item-level_itypes' => $itemLevelTypes);
 
 foreach my $biblioNum (@biblionumbers) {
 
-    
+    my $record = GetMarcBiblio($biblioNum);
+    my $subtitle = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, '');
     # Init the bib item with the choices for branch pickup
     my %biblioLoopIter = ( branchChoicesLoop => $CGIbranchloop );
 
@@ -322,11 +298,12 @@ foreach my $biblioNum (@biblionumbers) {
     my $biblioData = $biblioDataHash{$biblioNum};
     if (! $biblioData) {
         $template->param(message=>1, bad_biblionumber=>$biblioNum);
-       &get_out($query, $cookie, $template->output);
+        &get_out($query, $cookie, $template->output);
     }
 
     $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
     $biblioLoopIter{title} = $biblioData->{title};
+    $biblioLoopIter{subtitle} = $subtitle;
     $biblioLoopIter{author} = $biblioData->{author};
     $biblioLoopIter{rank} = $biblioData->{rank};
     $biblioLoopIter{reservecount} = $biblioData->{reservecount};
@@ -352,12 +329,10 @@ foreach my $biblioNum (@biblionumbers) {
         
         if (!$itemInfo->{'notforloan'} && !($itemInfo->{'itemnotforloan'} > 0)) {
             $biblioLoopIter{forloan} = 1;
-       }
+        }
     }
 
-    $biblioLoopIter{itemTypeDescription} =
-      $itemTypes->{$biblioData->{itemtype}}{description};
-    
+    $biblioLoopIter{itemTypeDescription} = $itemTypes->{$biblioData->{itemtype}}{description};
 
     $biblioLoopIter{itemLoop} = [];
     my $numCopiesAvailable = 0;
@@ -369,7 +344,7 @@ foreach my $biblioNum (@biblionumbers) {
         $itemLoopIter->{barcode} = $itemInfo->{barcode};
         $itemLoopIter->{homeBranchName} = $branches->{$itemInfo->{homebranch}}{branchname};
         $itemLoopIter->{callNumber} = $itemInfo->{itemcallnumber};
-
+        $itemLoopIter->{copynumber} = $itemInfo->{copynumber};
         if ($itemLevelTypes) {
             $itemLoopIter->{description} = $itemInfo->{description};
             $itemLoopIter->{imageurl} = $itemInfo->{imageurl};
@@ -397,10 +372,10 @@ foreach my $biblioNum (@biblionumbers) {
         if ( defined $reservedate ) {
             $itemLoopIter->{backgroundcolor} = 'reserved';
             $itemLoopIter->{reservedate}     = format_date($reservedate);
-            $itemLoopIter->{ReservedForBorrowernumber}     = $reservedfor;
-            $itemLoopIter->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
-            $itemLoopIter->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
-            $itemLoopIter->{ExpectedAtLibrary}     = $expectedAt;
+            $itemLoopIter->{ReservedForBorrowernumber} = $reservedfor;
+            $itemLoopIter->{ReservedForSurname}        = $ItemBorrowerReserveInfo->{'surname'};
+            $itemLoopIter->{ReservedForFirstname}      = $ItemBorrowerReserveInfo->{'firstname'};
+            $itemLoopIter->{ExpectedAtLibrary}         = $expectedAt;
         }
 
         $itemLoopIter->{notforloan} = $itemInfo->{notforloan};
@@ -459,7 +434,6 @@ foreach my $biblioNum (@biblionumbers) {
             $itemLoopIter->{waitingdate} = format_date($wait_hashref->{waitingdate});
         }
        $itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', $itemTypes->{ $itemInfo->{itype} }{imageurl} );
-
         
         push @{$biblioLoopIter{itemLoop}}, $itemLoopIter;
     }
@@ -476,12 +450,10 @@ foreach my $biblioNum (@biblionumbers) {
     push @$biblioLoop, \%biblioLoopIter;
 }
 
-
 if ( $numBibsAvailable == 0 ) {
     $template->param( none_available => 1, message => 1 );
 }
 
-
 my $itemTableColspan = 5;
 if (!$template->param('OPACItemHolds')) {
     $itemTableColspan--;
@@ -491,16 +463,7 @@ if ($template->param('singleBranchMode')) {
 }
 $template->param(itemtable_colspan => $itemTableColspan);
 
-
-
 # display infos
 $template->param(bibitemloop => $biblioLoop);
 output_html_with_http_headers $query, $cookie, $template->output;
 
-
-
-
-
-# Local Variables:
-# tab-width: 8
-# End:
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git