X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=6173b728622b436d5605315bc1c366cf4b9e5973;hb=e917b5788ccc406263b49eda7bce6177260f73e6;hp=3d8025cd52cccd4cf73ea64e44625a88c2134cc2;hpb=05486da41f4627ea83263f0b90a829c9f32b0cd9;p=srvgit diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 3d8025cd52..6173b72862 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -20,13 +20,11 @@ # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use C4::Acquisition qw( SearchOrders ); use C4::Auth qw(:DEFAULT get_session); -use C4::Branch; use C4::Koha; use C4::Serials; #uses getsubscriptionfrom biblionumber use C4::Output; @@ -34,34 +32,47 @@ use C4::Biblio; use C4::Items; use C4::Circulation; use C4::Tags qw(get_tags); -use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn); +use C4::XISBN qw(get_xisbns); use C4::External::Amazon; +use C4::External::BakerTaylor qw( image_url link_url ); use C4::External::Syndetics qw(get_syndetics_index get_syndetics_summary get_syndetics_toc get_syndetics_excerpt get_syndetics_reviews get_syndetics_anotes ); -use C4::Review; -use C4::Ratings; use C4::Members; use C4::XSLT; use C4::ShelfBrowser; use C4::Reserves; use C4::Charset; +use C4::Letters; use MARC::Record; use MARC::Field; use List::MoreUtils qw/any none/; -use C4::Images; use Koha::DateUtils; use C4::HTML5Media; use C4::CourseReserves qw(GetItemCourseReservesInfo); +use Koha::Biblios; +use Koha::RecordProcessor; +use Koha::AuthorisedValues; +use Koha::CirculationRules; +use Koha::Items; +use Koha::ItemTypes; +use Koha::Acquisition::Orders; use Koha::Virtualshelves; +use Koha::Patrons; +use Koha::Plugins; +use Koha::Ratings; +use Koha::Reviews; +use Koha::SearchEngine::Search; -BEGIN { - if (C4::Context->preference('BakerTaylorEnabled')) { - require C4::External::BakerTaylor; - import C4::External::BakerTaylor qw(&image_url &link_url); - } -} +use Try::Tiny; + +my $query = CGI->new(); + +my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0; +$biblionumber = int($biblionumber); + +my $specific_item = $query->param('itemnumber') ? Koha::Items->find( scalar $query->param('itemnumber') ) : undef; +$biblionumber = $specific_item->biblionumber if $specific_item; -my $query = new CGI; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { template_name => "opac-detail.tt", @@ -71,26 +82,46 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( } ); -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; - } +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); +my $record = GetMarcBiblio({ + biblionumber => $biblionumber, + opac => 1 }); if ( ! $record ) { print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early exit; } +my $biblio = Koha::Biblios->find( $biblionumber ); +unless ( $patron and $patron->category->override_hidden_items ) { + # only skip this check if there's a logged in user + # and its category overrides OpacHiddenItems + if ( $biblio->hidden_in_opac({ rules => C4::Context->yaml_preference('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 } ); + } +} + +my $framework = $biblio ? $biblio->frameworkcode : q{}; +my $record_processor = Koha::RecordProcessor->new({ + filters => 'ViewPolicy', + options => { + interface => 'opac', + frameworkcode => $framework + } +}); +$record_processor->process($record); + # redirect if opacsuppression is enabled and biblio is suppressed if (C4::Context->preference('OpacSuppression')) { # FIXME hardcoded; the suppression flag ought to be materialized @@ -122,7 +153,9 @@ if (C4::Context->preference('OpacSuppression')) { } } -$template->param( biblionumber => $biblionumber ); +$template->param( + biblio => $biblio +); # get biblionumbers stored in the cart my @cart_list; @@ -141,12 +174,53 @@ my $marcflavour = C4::Context->preference("marcflavour"); my $ean = GetNormalizedEAN( $record, $marcflavour ); # XSLT processing of some stuff -if (C4::Context->preference("OPACXSLTDetailsDisplay") ) { - $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, "OPACXSLTDetailsDisplay" ) ); +my $xslfile = C4::Context->preference('OPACXSLTDetailsDisplay'); +my $lang = $xslfile ? C4::Languages::getlanguage() : undef; +my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef; + +if ( $xslfile ) { + + my $searcher = Koha::SearchEngine::Search->new( + { index => $Koha::SearchEngine::BIBLIOS_INDEX } + ); + my $cleaned_title = $biblio->title; + $cleaned_title =~ tr|/||; + my $query = + ( C4::Context->preference('UseControlNumber') and $record->field('001') ) + ? 'rcn:'. $record->field('001')->data . ' AND (bib-level:a OR bib-level:b)' + : "Host-item:$cleaned_title"; + my ( $err, $result, $count ) = $searcher->simple_search_compat( $query, 0, 0 ); + + warn "Warning from simple_search_compat: $err" + if $err; + + my $variables = { + anonymous_session => ($borrowernumber) ? 0 : 1, + show_analytics_link => $count > 0 ? 1 : 0 + }; + + 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, $record, "OPACXSLTDetailsDisplay", 1, undef, + $sysxml, $xslfile, $lang, $variables + ) + ); } my $OpacBrowseResults = C4::Context->preference("OpacBrowseResults"); -$template->{VARS}->{'OpacBrowseResults'} = $OpacBrowseResults; # We look for the busc param to build the simple paging from the search if ($OpacBrowseResults) { @@ -173,6 +247,7 @@ if ($session->param('busc')) { } } else { for my $value (@{$arrParamsBusc->{$_}}) { + next if !defined($value); $pasarParams .= '&' if ($j); $pasarParams .= $_ . '=' . Encode::decode('UTF-8', uri_escape_utf8($value)); $j++; @@ -187,9 +262,7 @@ if ($session->param('busc')) { { my ($arrParamsBusc, $offset, $results_per_page) = @_; - my $expanded_facet = $arrParamsBusc->{'expand'}; - my $branches = GetBranches(); - my $itemtypes = GetItemTypes; + my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; my @servers; @servers = @{$arrParamsBusc->{'server'}} if $arrParamsBusc->{'server'}; @servers = ("biblioserver") unless (@servers); @@ -200,14 +273,18 @@ if ($session->param('busc')) { $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,$itemtypes,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'}); + ($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 $hits; my @newresults; + my $search_context = { + 'interface' => 'opac', + 'category' => ($patron) ? $patron->categorycode : q{} + }; for (my $i=0;$i<@servers;$i++) { my $server = $servers[$i]; $hits = $results_hashref->{$server}->{"hits"}; - @newresults = searchResults('opac', '', $hits, $results_per_page, $offset, $arrParamsBusc->{'scan'}, $results_hashref->{$server}->{"RECORDS"}); + @newresults = searchResults( $search_context, '', $hits, $results_per_page, $offset, $arrParamsBusc->{'scan'}, $results_hashref->{$server}->{"RECORDS"}); } return \@newresults; }#searchAgain @@ -414,48 +491,49 @@ if ($session->param('busc')) { $numberBiblioPaging = $paging{'previous'}->{biblionumber}; if ($numberBiblioPaging) { $template->param( 'previousBiblionumber' => $numberBiblioPaging ); - $dataBiblioPaging = GetBiblioData($numberBiblioPaging); - $template->param('previousTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging); + $dataBiblioPaging = Koha::Biblios->find( $numberBiblioPaging ); + $template->param('previousTitle' => $dataBiblioPaging->title) if $dataBiblioPaging; } # Next biblio $numberBiblioPaging = $paging{'next'}->{biblionumber}; if ($numberBiblioPaging) { $template->param( 'nextBiblionumber' => $numberBiblioPaging ); - $dataBiblioPaging = GetBiblioData($numberBiblioPaging); - $template->param('nextTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging); + $dataBiblioPaging = Koha::Biblios->find( $numberBiblioPaging ); + $template->param('nextTitle' => $dataBiblioPaging->title) if $dataBiblioPaging; } # Partial list of biblio results my @listResults; for (my $j = 0; $j < @arrBiblios; $j++) { next unless ($arrBiblios[$j]); - $dataBiblioPaging = GetBiblioData($arrBiblios[$j]) if ($arrBiblios[$j] != $biblionumber); - 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]}; + $dataBiblioPaging = Koha::Biblios->find( $arrBiblios[$j] ) if ($arrBiblios[$j] != $biblionumber); + 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]}; } $template->param('listResults' => \@listResults) if (@listResults); $template->param('indexPag' => 1 + $offset, 'totalPag' => $arrParamsBusc{'total'}, 'indexPagEnd' => scalar(@arrBiblios) + $offset); + $template->param( 'offset' => $offset ); } } +$template->param( + OPACShowCheckoutName => C4::Context->preference("OPACShowCheckoutName"), +); -$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) ); -$template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") ); -$template->param('OPACShowBarcode' => C4::Context->preference("OPACShowBarcode") ); - -# adding items linked via host biblios - -my $analyticfield = '773'; -if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC'){ - $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); +if ( C4::Context->preference('EasyAnalyticalRecords') ) { + # adding items linked via host biblios + my $analyticfield = '773'; + if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC'){ + $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); + } } } } @@ -480,7 +558,6 @@ if ($hideitems) { @items = @all_items; } -my $branches = GetBranches(); my $branch = ''; if (C4::Context->userenv){ $branch = C4::Context->userenv->{branch}; @@ -491,19 +568,19 @@ if ( C4::Context->preference('HighlightOwnItemsOnOPAC') ) { || C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - my $branchname; + my $branchcode; if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { - $branchname = $branches->{$branch}->{'branchname'}; + $branchcode = $branch; } elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - $branchname = $branches->{ $ENV{'BRANCHCODE'} }->{'branchname'}; + $branchcode = $ENV{'BRANCHCODE'}; } my @our_items; my @other_items; foreach my $item ( @items ) { - if ( $item->{'branchname'} eq $branchname ) { + if ( $item->{branchcode} eq $branchcode ) { $item->{'this_branch'} = 1; push( @our_items, $item ); } else { @@ -516,17 +593,26 @@ if ( C4::Context->preference('HighlightOwnItemsOnOPAC') ) { } my $dat = &GetBiblioData($biblionumber); +my $HideMARC = $record_processor->filters->[0]->should_hide_marc( + { + frameworkcode => $dat->{'frameworkcode'}, + interface => 'opac', + } ); -my $itemtypes = GetItemTypes(); +my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; # imageurl: my $itemtype = $dat->{'itemtype'}; if ( $itemtype ) { $dat->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} ); $dat->{'description'} = $itemtypes->{$itemtype}->{translated_description}; } -my $shelflocations =GetKohaAuthorisedValues('items.location',$dat->{'frameworkcode'}, 'opac'); -my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'}, 'opac'); -my $copynumbers = GetKohaAuthorisedValues('items.copynumber',$dat->{'frameworkcode'}, 'opac'); + +my $shelflocations = + { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $dat->{frameworkcode}, kohafield => 'items.location' } ) }; +my $collections = + { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $dat->{frameworkcode}, kohafield => 'items.ccode' } ) }; +my $copynumbers = + { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $dat->{frameworkcode}, kohafield => 'items.copynumber' } ) }; #coping with subscriptions my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber); @@ -544,24 +630,28 @@ foreach my $subscription (@subscriptions) { $cell{histstartdate} = $subscription->{histstartdate}; $cell{histenddate} = $subscription->{histenddate}; $cell{branchcode} = $subscription->{branchcode}; - $cell{branchname} = GetBranchName($subscription->{branchcode}); - $cell{hasalert} = $subscription->{hasalert}; $cell{callnumber} = $subscription->{callnumber}; + $cell{location} = $subscription->{location}; $cell{closed} = $subscription->{closed}; + $cell{letter} = $subscription->{letter}; + $cell{biblionumber} = $subscription->{biblionumber}; #get the three latest serials. $serials_to_display = $subscription->{opacdisplaycount}; $serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display; $cell{opacdisplaycount} = $serials_to_display; $cell{latestserials} = GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display ); + if ( $borrowernumber ) { + my $subscription_object = Koha::Subscriptions->find( $subscription->{subscriptionid} ); + my $subscriber = $subscription_object->subscribers->find( $borrowernumber ); + $cell{hasalert} = 1 if $subscriber; + } push @subs, \%cell; } $dat->{'count'} = scalar(@items); -my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $biblionumber, $record ) ); - my (%item_reserves, %priority); my ($show_holds_count, $show_priority); for ( C4::Context->preference("OPACShowHoldQueueDetails") ) { @@ -570,15 +660,15 @@ for ( C4::Context->preference("OPACShowHoldQueueDetails") ) { } my $has_hold; if ( $show_holds_count || $show_priority) { - 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) { + my $holds = $biblio->holds; + $template->param( holds_count => $holds->count ); + while ( my $hold = $holds->next ) { + $item_reserves{ $hold->itemnumber }++ if $hold->itemnumber; + if ($show_priority && $hold->borrowernumber == $borrowernumber) { $has_hold = 1; - $_->{itemnumber} - ? ($priority{ $_->{itemnumber} } = $_->{priority}) - : ($template->param( priority => $_->{priority} )); + $hold->itemnumber + ? ($priority{ $hold->itemnumber } = $hold->priority) + : ($template->param( priority => $hold->priority )); } } } @@ -604,27 +694,28 @@ if ( C4::Context->preference('OPACAcquisitionDetails' ) ) { }); my $total_quantity = 0; for my $order ( @$orders ) { - if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) { - for my $itemnumber ( C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ) { - push @itemnumbers_on_order, $itemnumber; - } + 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'); } - $total_quantity += $order->{quantity}; + $total_quantity += $order->quantity; } $template->{VARS}->{acquisition_details} = { total_quantity => $total_quantity, }; } +my $allow_onshelf_holds; +my ( $itemloop_has_images, $otheritemloop_has_images ); if ( not $viewallitems and @items > $max_items_to_display ) { $template->param( too_many_items => 1, items_count => scalar( @items ), ); } else { - my $allow_onshelf_holds; - my $borrower = GetMember( 'borrowernumber' => $borrowernumber ); for my $itm (@items) { + my $item = Koha::Items->find( $itm->{itemnumber} ); $itm->{holds_count} = $item_reserves{ $itm->{itemnumber} }; $itm->{priority} = $priority{ $itm->{itemnumber} }; $norequests = 0 @@ -635,7 +726,7 @@ if ( not $viewallitems and @items > $max_items_to_display ) { && !$itemtypes->{$itm->{'itype'}}->{notforloan} && $itm->{'itemnumber'}; - $allow_onshelf_holds = C4::Reserves::OnShelfHoldsAllowed( $itm, $borrower ) + $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } ) unless $allow_onshelf_holds; # get collection code description, too @@ -650,19 +741,10 @@ if ( not $viewallitems and @items > $max_items_to_display ) { $itm->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} ); $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description}; } - foreach (qw(ccode enumchron copynumber itemnotes uri)) { + foreach (qw(ccode materials enumchron copynumber itemnotes location_description uri)) { $itemfields{$_} = 1 if ($itm->{$_}); } - # walk through the item-level authorised values and populate some images - my $item_authorised_value_images = C4::Items::get_authorised_value_images( C4::Items::get_item_authorised_values( $itm->{'itemnumber'} ) ); - # warn( Data::Dumper->Dump( [ $item_authorised_value_images ], [ 'item_authorised_value_images' ] ) ); - - if ( $itm->{'itemlost'} ) { - my $lostimageinfo = List::Util::first { $_->{'category'} eq 'LOST' } @$item_authorised_value_images; - $itm->{'lostimageurl'} = $lostimageinfo->{ 'imageurl' }; - $itm->{'lostimagelabel'} = $lostimageinfo->{ 'label' }; - } my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber}); if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; } if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; } @@ -670,31 +752,44 @@ if ( not $viewallitems and @items > $max_items_to_display ) { my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber}); if ( defined( $transfertwhen ) && $transfertwhen ne '' ) { $itm->{transfertwhen} = $transfertwhen; - $itm->{transfertfrom} = $branches->{$transfertfrom}{branchname}; - $itm->{transfertto} = $branches->{$transfertto}{branchname}; + $itm->{transfertfrom} = $transfertfrom; + $itm->{transfertto} = $transfertto; } - if ( C4::Context->preference('OPACAcquisitionDetails') - and C4::Context->preference('AcqCreateItem') eq 'ordering' ) - { + if ( C4::Context->preference('OPACAcquisitionDetails') ) { $itm->{on_order} = 1 - if grep /^$itm->{itemnumber}$/, @itemnumbers_on_order; + if grep { $_ eq $itm->{itemnumber} } @itemnumbers_on_order; + } + + if ( C4::Context->preference("OPACLocalCoverImages") == 1 ) { + $itm->{cover_images} = $item->cover_images; } my $itembranch = $itm->{$separatebranch}; if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) { if ($itembranch and $itembranch eq $currentbranch) { push @itemloop, $itm; + $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; } } - $template->param( 'AllowOnShelfHolds' => $allow_onshelf_holds ); } +if( $allow_onshelf_holds || CountItemsIssued($biblionumber) || $biblio->has_items_waiting_or_intransit ) { + $template->param( ReservableItems => 1 ); +} + +$template->param( + itemloop_has_images => $itemloop_has_images, + otheritemloop_has_images => $otheritemloop_has_images, +); + # Display only one tab if one items list is empty if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) { $template->param(SeparateHoldings => 0); @@ -710,7 +805,6 @@ if (!C4::Context->preference("OPACXSLTDetailsDisplay") ) { my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour); my $marcseriesarray = GetMarcSeries ($record,$marcflavour); my $marcurlsarray = GetMarcUrls ($record,$marcflavour); - my $marchostsarray = GetMarcHosts($record,$marcflavour); $template->param( MARCSUBJCTS => $marcsubjctsarray, @@ -718,24 +812,33 @@ if (!C4::Context->preference("OPACXSLTDetailsDisplay") ) { MARCSERIES => $marcseriesarray, MARCURLS => $marcurlsarray, MARCISBNS => $marcisbnsarray, - MARCHOSTS => $marchostsarray, ); } -my $marcnotesarray = GetMarcNotes ($record,$marcflavour); -my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber)); +my $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour, opac => 1 }); + +if( C4::Context->preference('ArticleRequests') ) { + my $patron = $borrowernumber ? Koha::Patrons->find($borrowernumber) : undef; + my $itemtype = Koha::ItemTypes->find($biblio->itemtype); + my $artreqpossible = $patron + ? $biblio->can_article_request( $patron ) + : $itemtype + ? $itemtype->may_article_request + : q{}; + $template->param( artreqpossible => $artreqpossible ); +} $template->param( MARCNOTES => $marcnotesarray, norequests => $norequests, RequestOnOpac => C4::Context->preference("RequestOnOpac"), itemdata_ccode => $itemfields{ccode}, + itemdata_materials => $itemfields{materials}, itemdata_enumchron => $itemfields{enumchron}, itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, - itemdata_itemnotes => $itemfields{itemnotes}, - authorised_value_images => $biblio_authorised_value_images, - subtitle => $subtitle, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_location => $itemfields{location_description}, OpacStarRatings => C4::Context->preference("OpacStarRatings"), ); @@ -766,7 +869,9 @@ if (C4::Context->preference("AlternateHoldingsField") && scalar @items == 0) { ); } +# FIXME: The template uses this hash directly. Need to filter. foreach ( keys %{$dat} ) { + next if ( $HideMARC->{$_} ); $template->param( "$_" => defined $dat->{$_} ? $dat->{$_} : '' ); } @@ -788,44 +893,47 @@ $template->param( content_identifier_exists => $content_identifier_exists, ); +# Catch the exception as Koha::Biblio::Metadata->record can explode if the MARCXML is invalid # COinS format FIXME: for books Only -$template->param( - ocoins => GetCOinSBiblio($record), -); +my $coins = eval { $biblio->get_coins }; +$template->param( ocoins => $coins ); -my $libravatar_enabled = 0; -if ( C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) { - eval { - require Libravatar::URL; - Libravatar::URL->import(); - }; - if (!$@ ) { - $libravatar_enabled = 1; +my ( $loggedincommenter, $reviews ); +if ( C4::Context->preference('OPACComments') ) { + $reviews = Koha::Reviews->search( + { + biblionumber => $biblionumber, + -or => { approved => 1, borrowernumber => $borrowernumber } + }, + { + order_by => { -desc => 'datereviewed' } + } + )->unblessed; + my $libravatar_enabled = 0; + if ( C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto') ) { + eval { + require Libravatar::URL; + Libravatar::URL->import(); + }; + if ( !$@ ) { + $libravatar_enabled = 1; + } } -} - -my $reviews = getreviews( $biblionumber, 1 ); -my $loggedincommenter; - - - + for my $review (@$reviews) { + my $review_patron = Koha::Patrons->find( $review->{borrowernumber} ); # FIXME Should be Koha::Review->reviewer or similar + + # setting some borrower info into this hash + if ( $review_patron ) { + $review->{patron} = $review_patron; + if ( $libravatar_enabled and $review_patron->email ) { + $review->{avatarurl} = libravatar_url( email => $review_patron->email, https => $ENV{HTTPS} ); + } -foreach ( @$reviews ) { - my $borrowerData = GetMember('borrowernumber' => $_->{borrowernumber}); - # setting some borrower info into this hash - $_->{title} = $borrowerData->{'title'}; - $_->{surname} = $borrowerData->{'surname'}; - $_->{firstname} = $borrowerData->{'firstname'}; - if ($libravatar_enabled and $borrowerData->{'email'}) { - $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); + if ( $review_patron->borrowernumber eq $borrowernumber ) { + $loggedincommenter = 1; + } + } } - $_->{userid} = $borrowerData->{'userid'}; - $_->{cardnumber} = $borrowerData->{'cardnumber'}; - - if ($borrowerData->{'borrowernumber'} eq $borrowernumber) { - $_->{your_comment} = 1; - $loggedincommenter = 1; - } } if ( C4::Context->preference("OPACISBD") ) { @@ -835,7 +943,6 @@ if ( C4::Context->preference("OPACISBD") ) { $template->param( itemloop => \@itemloop, otheritemloop => \@otheritemloop, - subscriptionsnumber => $subscriptionsnumber, biblionumber => $biblionumber, subscriptions => \@subs, subscriptionsnumber => $subscriptionsnumber, @@ -861,7 +968,7 @@ if (C4::Context->preference("virtualshelves") ) { if (C4::Context->preference("OPACFRBRizeEditions")==1) { eval { $template->param( - XISBNS => get_xisbns($isbn) + XISBNS => scalar get_xisbns($isbn, $biblionumber) ); }; if ($@) { warn "XISBN Failed $@"; } @@ -1046,7 +1153,7 @@ if (C4::Context->preference("BakerTaylorEnabled")) { { $template->param( BakerTaylorContentURL => - sprintf("http://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=%s&Password=%s&ItemKey=%s&Options=Y", + sprintf("https://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=%s&Password=%s&ItemKey=%s&Options=Y", $bt_user,$bt_pass,$isbn) ); } @@ -1071,14 +1178,14 @@ if (C4::Context->preference("OPACURLOpenInNewWindow")) { $template->param(covernewwindow => 'false'); } +$template->param(borrowernumber => $borrowernumber); + if ( C4::Context->preference('OpacStarRatings') !~ /disable/ ) { - my $rating = GetRating( $biblionumber, $borrowernumber ); + my $ratings = Koha::Ratings->search({ biblionumber => $biblionumber }); + my $my_rating = $borrowernumber ? $ratings->search({ borrowernumber => $borrowernumber })->next : undef; $template->param( - rating_value => $rating->{'rating_value'}, - rating_total => $rating->{'rating_total'}, - rating_avg => $rating->{'rating_avg'}, - rating_avg_int => $rating->{'rating_avg_int'}, - borrowernumber => $borrowernumber + ratings => $ratings, + my_rating => $my_rating, ); } @@ -1121,12 +1228,16 @@ if ( C4::Context->preference("IDREF") ) { # the user wants, and what's available for display my $opac_serial_default = C4::Context->preference('opacSerialDefaultTab'); my $defaulttab = + $viewallitems + ? 'holdings' : $opac_serial_default eq 'subscriptions' && $subscriptionsnumber ? 'subscriptions' : $opac_serial_default eq 'serialcollection' && @serialcollections > 0 ? 'serialcollection' : $opac_serial_default eq 'holdings' && scalar (@itemloop) > 0 ? 'holdings' : + scalar (@itemloop) == 0 + ? 'media' : $subscriptionsnumber ? 'subscriptions' : @serialcollections > 0 @@ -1134,13 +1245,9 @@ my $defaulttab = $template->param('defaulttab' => $defaulttab); if (C4::Context->preference('OPACLocalCoverImages') == 1) { - my @images = ListImagesForBiblio($biblionumber); - $template->{VARS}->{localimages} = \@images; + $template->param( localimages => $biblio->cover_images ); } -$template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews'); -$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer'); -$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults'); $template->{VARS}->{OPACPopupAuthorsSearch} = C4::Context->preference('OPACPopupAuthorsSearch'); if (C4::Context->preference('OpacHighlightedWords')) { @@ -1155,8 +1262,7 @@ if ( C4::Context->preference('UseCourseReserves') ) { } $template->param( - 'OpacLocationBranchToDisplay' => C4::Context->preference('OpacLocationBranchToDisplay') , - 'OpacLocationBranchToDisplayShelving' => C4::Context->preference('OpacLocationBranchToDisplayShelving'), + 'OpacLocationBranchToDisplay' => C4::Context->preference('OpacLocationBranchToDisplay'), ); output_html_with_http_headers $query, $cookie, $template->output;