GetNormalizedOCLCNumber
GetNormalizedUPC
);
+use C4::Search qw( new_record_from_zebra searchResults getRecords );
use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials );
use C4::Output qw( parametrized_url output_html_with_http_headers );
use C4::Biblio qw(
CountItemsIssued
GetBiblioData
- GetMarcAuthors
- GetMarcBiblio
GetMarcControlnumber
GetMarcISBN
GetMarcISSN
GetMarcSubjects
GetMarcUrls
);
-use C4::Items qw( GetHiddenItemnumbers GetItemsInfo );
-use C4::Circulation qw( GetTransfers );
use C4::Tags qw( get_tags );
use C4::XISBN qw( get_xisbns );
use C4::External::Amazon qw( get_amazon_tld );
use Koha::Plugins;
use Koha::Ratings;
use Koha::Reviews;
+use Koha::Serial::Items;
use Koha::SearchEngine::Search;
use Koha::SearchEngine::QueryBuilder;
+use Koha::Util::MARC;
+use JSON qw( decode_json );
my $query = CGI->new();
}
);
-my @all_items = GetItemsInfo($biblionumber);
-if( $specific_item ) {
- @all_items = grep { $_->{itemnumber} == $query->param('itemnumber') } @all_items;
- $template->param( specific_item => 1 );
-}
-my @hiddenitems;
my $patron = Koha::Patrons->find( $borrowernumber );
-my $record = GetMarcBiblio({
- biblionumber => $biblionumber,
- opac => 1 });
-if ( ! $record ) {
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $record = $biblio ? $biblio->metadata->record : undef;
+unless ( $biblio && $record ) {
print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
exit;
}
-my $biblio = Koha::Biblios->find( $biblionumber );
+my $items = $biblio->items->search_ordered;
+if ($specific_item) {
+ $items = $items->search( { itemnumber => scalar $query->param('itemnumber') } );
+ $template->param( specific_item => 1 );
+}
+
unless ( $patron and $patron->category->override_hidden_items ) {
# only skip this check if there's a logged in user
# and its category overrides OpacHiddenItems
print $query->redirect('/cgi-bin/koha/errors/404.pl'); # escape early
exit;
}
- if ( scalar @all_items >= 1 ) {
- push @hiddenitems,
- GetHiddenItemnumbers( { items => \@all_items, borcat => $patron ? $patron->categorycode : undef } );
+ if ( $items->count >= 1 ) {
+ $items = $items->filter_by_visible_in_opac( { patron => $patron } );
}
}
my $marcflavour = C4::Context->preference("marcflavour");
my $ean = GetNormalizedEAN( $record, $marcflavour );
-{
- my $variables = {
- anonymous_session => ($borrowernumber) ? 0 : 1,
- };
-
- my $lang = C4::Languages::getlanguage();
- my @plugin_responses = Koha::Plugins->call(
- 'opac_detail_xslt_variables',
- {
- biblio_id => $biblionumber,
- lang => $lang,
- patron_id => $borrowernumber
-
- }
- );
- for my $plugin_variables ( @plugin_responses ) {
- $variables = { %$variables, %$plugin_variables };
- }
-
- $template->param(
- XSLTBloc => XSLTParse4Display(
- {
- biblionumber => $biblionumber,
- record => $record,
- xsl_syspref => 'OPACXSLTDetailsDisplay',
- fix_amps => 1,
- xslt_variables => $variables
- }
- ),
- );
-}
-
my $OpacBrowseResults = C4::Context->preference("OpacBrowseResults");
# We look for the busc param to build the simple paging from the search
my $session = get_session($query->cookie("CGISESSID"));
my %paging = (previous => {}, next => {});
if ($session->param('busc')) {
- use C4::Search;
use URI::Escape qw( uri_escape_utf8 uri_unescape );
# Rebuild the string to store on session
$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,undef,$itemtypes,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'});
+ my $searcher = Koha::SearchEngine::Search->new(
+ { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
+ my $json = JSON->new->utf8->allow_nonref(1);
+ ($error, $results_hashref, $facets) = $searcher->search_compat($json->decode($arrParamsBusc->{'query'}),$arrParamsBusc->{'simple_query'},\@sort_by,\@servers,$results_per_page,$offset,undef,$itemtypes,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'});
};
my $hits;
my @newresults;
my $search_context = {
- 'interface' => 'opac',
- 'category' => ($patron) ? $patron->categorycode : q{}
+ interface => 'opac',
+ patron => $patron,
};
for (my $i=0;$i<@servers;$i++) {
my $server = $servers[$i];
next unless ($arrBiblios[$j]);
$dataBiblioPaging = Koha::Biblios->find( $arrBiblios[$j] ) if ($arrBiblios[$j] != $biblionumber);
next unless $dataBiblioPaging;
- push @listResults, {index => $j + 1 + $offset, biblionumber => $arrBiblios[$j], title => ($arrBiblios[$j] == $biblionumber)?'':$dataBiblioPaging->title, author => ($arrBiblios[$j] != $biblionumber && $dataBiblioPaging->author)?$dataBiblioPaging->author:'', url => ($arrBiblios[$j] == $biblionumber)?'':'opac-detail.pl?biblionumber=' . $arrBiblios[$j]};
+ push @listResults, {index => $j + 1 + $offset, biblionumber => $arrBiblios[$j], title => ($arrBiblios[$j] == $biblionumber)?'':$dataBiblioPaging->title, author => ($arrBiblios[$j] != $biblionumber && $dataBiblioPaging->author)?$dataBiblioPaging->author:'', part_number => ($arrBiblios[$j] == $biblionumber)?'':$dataBiblioPaging->part_number, part_name => ($arrBiblios[$j] == $biblionumber)?'':$dataBiblioPaging->part_name, url => ($arrBiblios[$j] == $biblionumber)?'':'opac-detail.pl?biblionumber=' . $arrBiblios[$j]};
}
$template->param('listResults' => \@listResults) if (@listResults);
$template->param('indexPag' => 1 + $offset, 'totalPag' => $arrParamsBusc{'total'}, 'indexPagEnd' => scalar(@arrBiblios) + $offset);
OPACShowCheckoutName => C4::Context->preference("OPACShowCheckoutName"),
);
-if ( C4::Context->preference('EasyAnalyticalRecords') ) {
- # adding items linked via host biblios
- my $analyticfield = '773';
- if ($marcflavour eq 'MARC21'){
- $analyticfield = '773';
- } elsif ($marcflavour eq 'UNIMARC') {
- $analyticfield = '461';
- }
- foreach my $hostfield ( $record->field($analyticfield)) {
- my $hostbiblionumber = $hostfield->subfield("0");
- my $linkeditemnumber = $hostfield->subfield("9");
- my @hostitemInfos = GetItemsInfo($hostbiblionumber);
- foreach my $hostitemInfo (@hostitemInfos){
- if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
- push(@all_items, $hostitemInfo);
- }
+$items = Koha::Items->search_ordered(
+ [
+ 'me.biblionumber' => $biblionumber,
+ 'me.itemnumber' => {
+ -in => [
+ $biblio->host_items->get_column('itemnumber')
+ ]
}
- }
-}
-
-my @items;
-
-# Are there items to hide?
-my $hideitems;
-$hideitems = 1 if C4::Context->preference('hidelostitems') or scalar(@hiddenitems) > 0;
-
-# Hide items
-if ($hideitems) {
- for my $itm (@all_items) {
- if ( C4::Context->preference('hidelostitems') ) {
- push @items, $itm unless $itm->{itemlost} or any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
- } else {
- push @items, $itm unless any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
- }
-}
-} else {
- # Or not
- @items = @all_items;
-}
+ ],
+ { prefetch => [ 'issue', 'homebranch', 'holdingbranch' ] }
+)->filter_by_visible_in_opac({ patron => $patron }) unless $specific_item;
my $dat = &GetBiblioData($biblionumber);
my $HideMARC = $record_processor->filters->[0]->should_hide_marc(
push @subs, \%cell;
}
-$dat->{'count'} = scalar(@items);
-
+$dat->{'count'} = $items->count;
my (%item_reserves, %priority);
my ($show_holds_count, $show_priority);
# Get component parts details
my $showcomp = C4::Context->preference('ShowComponentRecords');
+my ( $parts, $show_analytics );
if ( $showcomp eq 'both' || $showcomp eq 'opac' ) {
- if ( my $components = $biblio->get_marc_components(300) ) {
- my $parts;
+ if ( my $components = $biblio->get_marc_components(C4::Context->preference('MaxComponentRecords')) ) {
+ $show_analytics = 1 if @{$components}; # just show link when having results
for my $part ( @{$components} ) {
- $part = MARC::Record->new_from_xml( $part, 'UTF-8' );
+ $part = C4::Search::new_record_from_zebra( 'biblioserver', $part );
+ my $id = Koha::SearchEngine::Search::extract_biblionumber( $part );
push @{$parts},
XSLTParse4Display(
{
- biblionumber => $biblionumber,
+ biblionumber => $id,
record => $part,
xsl_syspref => 'OPACXSLTResultsDisplay',
fix_amps => 1,
);
}
$template->param( ComponentParts => $parts );
+ my ( $comp_query, $comp_query_str, $comp_sort ) = $biblio->get_components_query;
+ my $cpq = $comp_query_str . "&sort_by=" . $comp_sort;
+ $template->param( ComponentPartsQuery => $cpq );
}
+} else { # check if we should show analytics anyway
+ $show_analytics = 1 if @{$biblio->get_marc_components(1)}; # count matters here, results does not
}
+# XSLT processing of some stuff
+my $variables = {};
+my $lang = C4::Languages::getlanguage();
+my @plugin_responses = Koha::Plugins->call(
+ 'opac_detail_xslt_variables',
+ {
+ biblio_id => $biblionumber,
+ lang => $lang,
+ patron_id => $borrowernumber,
+ },
+);
+for my $plugin_variables ( @plugin_responses ) {
+ $variables = { %$variables, %$plugin_variables };
+}
+$variables->{anonymous_session} = $borrowernumber ? 0 : 1;
+$variables->{show_analytics_link} = $show_analytics;
+$template->param(
+ XSLTBloc => XSLTParse4Display({
+ biblionumber => $biblionumber,
+ record => $record,
+ xsl_syspref => 'OPACXSLTDetailsDisplay',
+ fix_amps => 1,
+ xslt_variables => $variables,
+ }),
+);
+
# Get items on order
-my ( @itemnumbers_on_order );
if ( C4::Context->preference('OPACAcquisitionDetails' ) ) {
- my $orders = C4::Acquisition::SearchOrders({
- biblionumber => $biblionumber,
- ordered => 1,
- });
+ my $orders = $biblio->orders->filter_by_active;
my $total_quantity = 0;
- for my $order ( @$orders ) {
- my $order = Koha::Acquisition::Orders->find( $order->{ordernumber} );
- my $basket = $order->basket;
- if ( $basket->effective_create_items eq 'ordering' ) {
- @itemnumbers_on_order = $order->items->get_column('itemnumber');
- }
+ while ( my $order = $orders->next ) {
$total_quantity += $order->quantity;
}
$template->{VARS}->{acquisition_details} = {
my $allow_onshelf_holds;
my ( $itemloop_has_images, $otheritemloop_has_images );
-if ( not $viewallitems and @items > $max_items_to_display ) {
+if ( not $viewallitems and $items->count > $max_items_to_display ) {
$template->param(
too_many_items => 1,
- items_count => scalar( @items ),
+ items_count => $items->count,
);
-} else {
- for my $itm (@items) {
- my $item = Koha::Items->find( $itm->{itemnumber} );
- $itm->{holds_count} = $item_reserves{ $itm->{itemnumber} };
- $itm->{priority} = $priority{ $itm->{itemnumber} };
-
- $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } )
- unless $allow_onshelf_holds;
-
- # get collection code description, too
- my $ccode = $itm->{'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'} ) {
- $itm->{'location_description'} = $shelflocations->{ $itm->{'location'} };
- }
- if (exists $itm->{itype} && defined($itm->{itype}) && exists $itemtypes->{ $itm->{itype} }) {
- $itm->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
- $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
- }
- foreach (qw(ccode materials enumchron copynumber itemnotes location_description uri)) {
- $itemfields{$_} = 1 if ($itm->{$_});
- }
+}
+else {
+ my $library_info;
+ while ( my $item = $items->next ) {
+ my $item_info = $item->unblessed;
+ $item_info->{holds_count} = $item_reserves{ $item->itemnumber };
+ $item_info->{priority} = $priority{ $item->itemnumber };
+
+ # Get opac_info from Additional contents for home and holding library
+ my ( $opac_info_home, $opac_info_holding );
+ $opac_info_holding = $library_info->{ $item->holdingbranch } // $item->holding_branch->opac_info({ lang => $lang });
+ $library_info->{ $item->holdingbranch } = $opac_info_holding;
+ $opac_info_home = $library_info->{ $item->homebranch } // $item->home_branch->opac_info({ lang => $lang });
+ $library_info->{ $item->homebranch } = $opac_info_home;
+ $item_info->{holding_library_info} = $opac_info_holding->content if $opac_info_holding;
+ $item_info->{home_library_info} = $opac_info_home->content if $opac_info_home;
+
+ $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy(
+ { item => $item, patron => $patron } )
+ unless $allow_onshelf_holds;
+
+ # get collection code description, too
+ my $ccode = $item->ccode;
+ $item_info->{'ccode'} = $collections->{$ccode}
+ if defined($ccode)
+ && $collections
+ && exists( $collections->{$ccode} );
+
+ my $copynumber = $item->copynumber;
+ $item_info->{copynumber} = $copynumbers->{$copynumber}
+ if ( defined($copynumbers)
+ && defined($copynumber)
+ && exists( $copynumbers->{$copynumber} ) );
+
+ if ( defined $item->location ) {
+ $item_info->{'location_description'} =
+ $shelflocations->{ $item->location };
+ }
- my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber});
- if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; }
- if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; }
-
- my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber});
- if ( defined( $transfertwhen ) && $transfertwhen ne '' ) {
- $itm->{transfertwhen} = $transfertwhen;
- $itm->{transfertfrom} = $transfertfrom;
- $itm->{transfertto} = $transfertto;
- }
-
- if ( C4::Context->preference('OPACAcquisitionDetails') ) {
- $itm->{on_order} = 1
- if grep { $_ eq $itm->{itemnumber} } @itemnumbers_on_order;
- }
+ my $itemtype = $item->itemtype;
+ $item_info->{'imageurl'} = getitemtypeimagelocation( 'opac',
+ $itemtypes->{ $itemtype->itemtype }->{'imageurl'} );
+ $item_info->{'description'} =
+ $itemtypes->{ $itemtype->itemtype }->{translated_description};
- if ( C4::Context->preference("OPACLocalCoverImages") == 1 ) {
- $itm->{cover_images} = $item->cover_images;
- }
+ foreach my $field (
+ qw(ccode materials enumchron copynumber itemnotes location_description uri)
+ )
+ {
+ $itemfields{$field} = 1 if $item_info->{$field};
+ }
- my $itembranch = $itm->{$separatebranch};
- if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) {
- if ($itembranch and $itembranch eq $currentbranch) {
- push @itemloop, $itm;
+ # FIXME The following must be Koha::Item->serial
+ my $serial_item = Koha::Serial::Items->find($item->itemnumber);
+ if ( $serial_item ) {
+ $item_info->{serial} = $serial_item;
+ }
+
+ $item_info->{checkout} = $item->checkout;
+ $item_info->{object} = $item;
+
+
+ if ( C4::Context->preference("OPACLocalCoverImages") == 1 ) {
+ $item_info->{cover_images} = $item->cover_images;
+ }
+
+
+ if ( C4::Context->preference('UseCourseReserves') ) {
+ $item_info->{course_reserves} = GetItemCourseReservesInfo( itemnumber => $item->itemnumber );
+ }
+
+ $item_info->{holding_branch} = $item->holding_branch;
+ $item_info->{home_branch} = $item->home_branch;
+
+ my $itembranch = $item->$separatebranch;
+ if ( $currentbranch
+ and C4::Context->preference('OpacSeparateHoldings') )
+ {
+ if ( $itembranch and $itembranch eq $currentbranch ) {
+ push @itemloop, $item_info;
+ $itemloop_has_images++ if $item->cover_images->count;
+ }
+ else {
+ push @otheritemloop, $item_info;
+ $otheritemloop_has_images++ if $item->cover_images->count;
+ }
+ }
+ else {
+ push @itemloop, $item_info;
$itemloop_has_images++ if $item->cover_images->count;
- } else {
- push @otheritemloop, $itm;
- $otheritemloop_has_images++ if $item->cover_images->count;
}
- } else {
- push @itemloop, $itm;
- $itemloop_has_images++ if $item->cover_images->count;
}
- }
}
if( $allow_onshelf_holds || CountItemsIssued($biblionumber) || $biblio->has_items_waiting_or_intransit ) {
}
}
-my $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour, opac => 1 });
+my $marcnotesarray = $biblio->get_marc_notes({ opac => 1, record => $record });
if( C4::Context->preference('ArticleRequests') ) {
my $patron = $borrowernumber ? Koha::Patrons->find($borrowernumber) : undef;
$template->param(
MARCNOTES => $marcnotesarray,
norequests => $norequests,
- RequestOnOpac => C4::Context->preference("RequestOnOpac"),
itemdata_ccode => $itemfields{ccode},
itemdata_materials => $itemfields{materials},
itemdata_enumchron => $itemfields{enumchron},
OpacStarRatings => C4::Context->preference("OpacStarRatings"),
);
-if (C4::Context->preference("AlternateHoldingsField") && scalar @items == 0) {
+if (C4::Context->preference("AlternateHoldingsField") && $items->count == 0) {
my $fieldspec = C4::Context->preference("AlternateHoldingsField");
my $subfields = substr $fieldspec, 3;
my $holdingsep = C4::Context->preference("AlternateHoldingsSeparator") || ' ';
my $shelves = Koha::Virtualshelves->search(
{
biblionumber => $biblionumber,
- category => 2,
+ public => 1,
},
{
join => 'virtualshelfcontents',
if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
$dat->{title} =~ s/\/+$//; # remove trailing slash
$dat->{title} =~ s/\s+$//; # remove trailing space
+ my $oclc_no = Koha::Util::MARC::oclc_number( $record );
$search_for_title = parametrized_url(
$search_for_title,
{
ISSN => $issn,
CONTROLNUMBER => $marccontrolnumber,
BIBLIONUMBER => $biblionumber,
+ OCLC_NO => $oclc_no,
}
);
$template->param('OPACSearchForTitleIn' => $search_for_title);
? 'serialcollection' :
$opac_serial_default eq 'holdings' && scalar (@itemloop) > 0
? 'holdings' :
+ ( $showcomp eq 'both' || $showcomp eq 'opac' ) && scalar (@itemloop) == 0 && $parts
+ ? 'components' :
scalar (@itemloop) == 0
? 'media' :
$subscriptionsnumber
}
$template->{VARS}->{'trackclicks'} = C4::Context->preference('TrackClicks');
-if ( C4::Context->preference('UseCourseReserves') ) {
- foreach my $i ( @items ) {
- $i->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $i->{'itemnumber'} );
- }
-}
-
$template->param(
'OpacLocationBranchToDisplay' => C4::Context->preference('OpacLocationBranchToDisplay'),
);
+if ( C4::Context->preference('OPACAuthorIdentifiers') ) {
+ my @author_identifiers;
+ for my $author ( @{ $biblio->get_marc_authors } ) {
+ my $authid = $author->{authoritylink};
+ my $authority = Koha::Authorities->find($authid);
+ next unless $authority;
+ my $identifiers = $authority->get_identifiers;
+ next unless $identifiers && @$identifiers;
+ my ($name) =
+ map { $_->{value} }
+ grep { $_->{code} eq 'a' ? $_ : () }
+ @{ $author->{MARCAUTHOR_SUBFIELDS_LOOP} };
+ push @author_identifiers,
+ { authid => $authid, name => $name, identifiers => $identifiers };
+ }
+ $template->param( author_identifiers => \@author_identifiers );
+}
+
output_html_with_http_headers $query, $cookie, $template->output;
projects / srvgit / blobdiff