use C4::Images;
use Koha::DateUtils;
use C4::HTML5Media;
-use C4::CourseReserves qw(GetItemReservesInfo);
+use C4::CourseReserves qw(GetItemCourseReservesInfo);
BEGIN {
if (C4::Context->preference('BakerTaylorEnabled')) {
}
);
-my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0;
$biblionumber = int($biblionumber);
+my @all_items = GetItemsInfo($biblionumber);
+my @hiddenitems;
+if (scalar @all_items >= 1) {
+ push @hiddenitems, GetHiddenItemnumbers(@all_items);
+
+ if (scalar @hiddenitems == scalar @all_items ) {
+ print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
+ exit;
+ }
+}
+
my $record = GetMarcBiblio($biblionumber);
if ( ! $record ) {
print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
my $expanded_facet = $arrParamsBusc->{'expand'};
my $branches = GetBranches();
+ my $itemtypes = GetItemTypes;
my @servers;
@servers = @{$arrParamsBusc->{'server'}} if $arrParamsBusc->{'server'};
@servers = ("biblioserver") unless (@servers);
$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
my ($error, $results_hashref, $facets);
eval {
- ($error, $results_hashref, $facets) = getRecords($arrParamsBusc->{'query'},$arrParamsBusc->{'simple_query'},\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'});
+ ($error, $results_hashref, $facets) = getRecords($arrParamsBusc->{'query'},$arrParamsBusc->{'simple_query'},\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'});
};
my $hits;
my @newresults;
my ($previous, $next, $dataBiblioPaging);
# Previous biblio
if ($paging{'previous'}->{biblionumber}) {
- $previous = 'opac-detail.pl?biblionumber=' . $paging{'previous'}->{biblionumber};
+ $previous = 'opac-detail.pl?biblionumber=' . $paging{'previous'}->{biblionumber} . '&query_desc=' . $query->param('query_desc');
$dataBiblioPaging = GetBiblioData($paging{'previous'}->{biblionumber});
$template->param('previousTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging);
}
# Next biblio
if ($paging{'next'}->{biblionumber}) {
- $next = 'opac-detail.pl?biblionumber=' . $paging{'next'}->{biblionumber};
+ $next = 'opac-detail.pl?biblionumber=' . $paging{'next'}->{biblionumber} . '&query_desc=' . $query->param('query_desc');
$dataBiblioPaging = GetBiblioData($paging{'next'}->{biblionumber});
$template->param('nextTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging);
}
$template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") );
$template->param('OPACShowBarcode' => C4::Context->preference("OPACShowBarcode") );
-# change back when ive fixed request.pl
-my @all_items = GetItemsInfo( $biblionumber );
# adding items linked via host biblios
my @items;
-# Getting items to be hidden
-my @hiddenitems = GetHiddenItemnumbers(@all_items);
-
# Are there items to hide?
my $hideitems;
$hideitems = 1 if C4::Context->preference('hidelostitems') or scalar(@hiddenitems) > 0;
}
my $has_hold;
if ( $show_holds_count || $show_priority) {
- my ($reserve_count,$reserves) = GetReservesFromBiblionumber($biblionumber);
- $template->param( holds_count => $reserve_count ) if $show_holds_count;
+ my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
+ $template->param( holds_count => scalar( @$reserves ) ) if $show_holds_count;
foreach (@$reserves) {
$item_reserves{ $_->{itemnumber} }++ if $_->{itemnumber};
if ($show_priority && $_->{borrowernumber} == $borrowernumber) {
$itm->{holds_count} = $item_reserves{ $itm->{itemnumber} };
$itm->{priority} = $priority{ $itm->{itemnumber} };
$norequests = 0
- if ( (not $itm->{'wthdrawn'} )
+ if ( (not $itm->{'withdrawn'} )
&& (not $itm->{'itemlost'} )
&& ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} )
&& (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
# get collection code description, too
my $ccode = $itm->{'ccode'};
- $itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) );
+ $itm->{'ccode'} = $collections->{$ccode} if defined($ccode) && $collections && exists( $collections->{$ccode} );
my $copynumber = $itm->{'copynumber'};
$itm->{'copynumber'} = $copynumbers->{$copynumber} if ( defined($copynumbers) && defined($copynumber) && exists( $copynumbers->{$copynumber} ) );
if ( defined $itm->{'location'} ) {
# TODO: The limit of 50 could be a syspref
my $viewallitems = $query->param('viewallitems');
if (scalar(@itemloop) >= 50 && !$viewallitems) {
- $template->param('lotsofitems' => 1);
+ $template->param('lotsofholdingsitems' => 1);
+}
+if (scalar(@otheritemloop) >= 50 && !$viewallitems) {
+ $template->param('lotsofothersholdingsitems' => 1);
}
## get notes and subjects from MARC record
my $starting_itemnumber = $query->param('shelfbrowse_itemnumber');
if (defined($starting_itemnumber)) {
$template->param( OpenOPACShelfBrowser => 1) if $starting_itemnumber;
- my $nearby = GetNearbyItems($starting_itemnumber,3);
+ my $nearby = GetNearbyItems($starting_itemnumber);
$template->param(
+ starting_itemnumber => $starting_itemnumber,
starting_homebranch => $nearby->{starting_homebranch}->{description},
starting_location => $nearby->{starting_location}->{description},
starting_ccode => $nearby->{starting_ccode}->{description},
- starting_itemnumber => $nearby->{starting_itemnumber},
- shelfbrowser_prev_itemnumber => $nearby->{prev_itemnumber},
- shelfbrowser_next_itemnumber => $nearby->{next_itemnumber},
- shelfbrowser_prev_biblionumber => $nearby->{prev_biblionumber},
- shelfbrowser_next_biblionumber => $nearby->{next_biblionumber},
- PREVIOUS_SHELF_BROWSE => $nearby->{prev},
- NEXT_SHELF_BROWSE => $nearby->{next},
+ shelfbrowser_prev_item => $nearby->{prev_item},
+ shelfbrowser_next_item => $nearby->{next_item},
+ shelfbrowser_items => $nearby->{items},
);
# in which tab shelf browser should open ?
if ( C4::Context->preference('UseCourseReserves') ) {
foreach my $i ( @items ) {
- $i->{'course_reserves'} = GetItemReservesInfo( itemnumber => $i->{'itemnumber'} );
+ $i->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $i->{'itemnumber'} );
}
}