X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=a7c24ef3d9839e66933b6c1ff6f64bce3f29544a;hb=ddc4c5b8aa75cfe8994ff150a0cae4cc51656852;hp=41de4fd8c15403e73033b35df3fbcec805d5fc17;hpb=363e986c60b8d3a0fc6badf3739e58fbb3e65801;p=koha.git diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 41de4fd8c1..a7c24ef3d9 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -6,26 +6,25 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; -use CGI; +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; @@ -33,17 +32,15 @@ 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::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::VirtualShelves; 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/; @@ -52,6 +49,18 @@ use Koha::DateUtils; use C4::HTML5Media; use C4::CourseReserves qw(GetItemCourseReservesInfo); +use Koha::Biblios; +use Koha::RecordProcessor; +use Koha::AuthorisedValues; +use Koha::IssuingRules; +use Koha::Items; +use Koha::ItemTypes; +use Koha::Acquisition::Orders; +use Koha::Virtualshelves; +use Koha::Patrons; +use Koha::Ratings; +use Koha::Reviews; + BEGIN { if (C4::Context->preference('BakerTaylorEnabled')) { require C4::External::BakerTaylor; @@ -59,24 +68,39 @@ BEGIN { } } -my $query = new CGI; +my $query = CGI->new(); + +my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0; +$biblionumber = int($biblionumber); + my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { - template_name => "opac-detail.tmpl", + template_name => "opac-detail.tt", query => $query, type => "opac", authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, } ); -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); +my $patron = Koha::Patrons->find( $borrowernumber ); +our $borcat= q{}; +if ( C4::Context->preference('OpacHiddenItemsExceptions') ) { + $borcat = $patron ? $patron->categorycode : q{}; +} + +my $record = GetMarcBiblio({ + biblionumber => $biblionumber, + opac => 1 }); +if ( ! $record ) { + print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early + exit; +} + +if ( scalar @all_items >= 1 ) { + push @hiddenitems, + GetHiddenItemnumbers( { items => \@all_items, borcat => $borcat } ); if (scalar @hiddenitems == scalar @all_items ) { print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early @@ -84,12 +108,49 @@ if (scalar @all_items >= 1) { } } -my $record = GetMarcBiblio($biblionumber); -if ( ! $record ) { - print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early - exit; +my $biblio = Koha::Biblios->find( $biblionumber ); +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 + # as a column on biblio or the like + my $opacsuppressionfield = '942'; + my $opacsuppressionfieldvalue = $record->field($opacsuppressionfield); + # redirect to opac-blocked info page or 404? + my $opacsuppressionredirect; + if ( C4::Context->preference("OpacSuppressionRedirect") ) { + $opacsuppressionredirect = "/cgi-bin/koha/opac-blocked.pl"; + } else { + $opacsuppressionredirect = "/cgi-bin/koha/errors/404.pl"; + } + if ( $opacsuppressionfieldvalue && + $opacsuppressionfieldvalue->subfield("n") && + $opacsuppressionfieldvalue->subfield("n") == 1) { + # if OPAC suppression by IP address + if (C4::Context->preference('OpacSuppressionByIPRange')) { + my $IPAddress = $ENV{'REMOTE_ADDR'}; + my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); + if ($IPAddress !~ /^$IPRange/) { + print $query->redirect($opacsuppressionredirect); + exit; + } + } else { + print $query->redirect($opacsuppressionredirect); + exit; + } + } } -$template->param( biblionumber => $biblionumber ); + +$template->param( biblio => $biblio ); # get biblionumbers stored in the cart my @cart_list; @@ -108,12 +169,20 @@ 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 ) { + $template->param( + XSLTBloc => XSLTParse4Display( + $biblionumber, $record, "OPACXSLTDetailsDisplay", + 1, undef, $sysxml, $xslfile, $lang + ) + ); } 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) { @@ -121,8 +190,10 @@ my $session = get_session($query->cookie("CGISESSID")); my %paging = (previous => {}, next => {}); if ($session->param('busc')) { use C4::Search; + use URI::Escape; # Rebuild the string to store on session + # param value is URI encoded and params separator is HTML encode (&) sub rebuildBuscParam { my $arrParamsBusc = shift; @@ -133,13 +204,14 @@ if ($session->param('busc')) { if ($_ =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|total|offset|offsetSearch|next|previous|count|expand|scan)/) { if (defined($arrParamsBusc->{$_})) { $pasarParams .= '&' if ($j); - $pasarParams .= $_ . '=' . $arrParamsBusc->{$_}; + $pasarParams .= $_ . '=' . Encode::decode('UTF-8', uri_escape_utf8( $arrParamsBusc->{$_} )); $j++; } } else { for my $value (@{$arrParamsBusc->{$_}}) { + next if !defined($value); $pasarParams .= '&' if ($j); - $pasarParams .= $_ . '=' . $value; + $pasarParams .= $_ . '=' . Encode::decode('UTF-8', uri_escape_utf8($value)); $j++; } } @@ -153,8 +225,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); @@ -165,14 +236,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,$expanded_facet,undef,$itemtypes,$arrParamsBusc->{'query_type'},$arrParamsBusc->{'scan'}); }; my $hits; my @newresults; + my $search_context = { + 'interface' => 'opac', + 'category' => $borcat + }; 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 @@ -201,12 +276,12 @@ if ($session->param('busc')) { for (@arrBusc) { ($key, $value) = split(/=/, $_, 2); if ($key =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|next|previous|total|offset|offsetSearch|count|expand|scan)/) { - $arrParamsBusc{$key} = $value; + $arrParamsBusc{$key} = uri_unescape($value); } else { unless (exists($arrParamsBusc{$key})) { $arrParamsBusc{$key} = []; } - push @{$arrParamsBusc{$key}}, $value; + push @{$arrParamsBusc{$key}}, uri_unescape($value); } } my $searchAgain = 0; @@ -279,7 +354,7 @@ if ($session->param('busc')) { for (@arrBusc) { unless ($_ =~ /^(?:query|listBiblios|newlistBiblios|query_type|simple_query|next|previous|total|count|offsetSearch)/) { $buscParam .= '&' unless ($j == 0); - $buscParam .= $_; + $buscParam .= $_; # string already URI encoded $j++; } } @@ -374,41 +449,37 @@ if ($session->param('busc')) { my $newbusc = rebuildBuscParam(\%arrParamsBusc); $session->param("busc" => $newbusc); } - my ($previous, $next, $dataBiblioPaging); + my ($numberBiblioPaging, $dataBiblioPaging); # Previous biblio - if ($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); + $numberBiblioPaging = $paging{'previous'}->{biblionumber}; + if ($numberBiblioPaging) { + $template->param( 'previousBiblionumber' => $numberBiblioPaging ); + $dataBiblioPaging = Koha::Biblios->find( $numberBiblioPaging ); + $template->param('previousTitle' => $dataBiblioPaging->title) if $dataBiblioPaging; } # Next biblio - if ($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); + $numberBiblioPaging = $paging{'next'}->{biblionumber}; + if ($numberBiblioPaging) { + $template->param( 'nextBiblionumber' => $numberBiblioPaging ); + $dataBiblioPaging = Koha::Biblios->find( $numberBiblioPaging ); + $template->param('nextTitle' => $dataBiblioPaging->title) if $dataBiblioPaging; } - $template->param('previous' => $previous, 'next' => $next); # 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( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') ); -$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) ); - - - -$template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") ); -$template->param('OPACShowBarcode' => C4::Context->preference("OPACShowBarcode") ); +$template->param( + OPACShowCheckoutName => C4::Context->preference("OPACShowCheckoutName"), +); # adding items linked via host biblios @@ -449,7 +520,6 @@ if ($hideitems) { @items = @all_items; } -my $branches = GetBranches(); my $branch = ''; if (C4::Context->userenv){ $branch = C4::Context->userenv->{branch}; @@ -460,19 +530,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 { @@ -485,21 +555,30 @@ 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}->{'description'}; + $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); -my @subscriptions = GetSubscriptions($dat->{'title'}, $dat->{'issn'}, $ean, $biblionumber ); +my @subscriptions = SearchSubscriptions({ biblionumber => $biblionumber, orderby => 'title' }); my @subs; $dat->{'serial'}=1 if $subscriptionsnumber; @@ -513,24 +592,27 @@ 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{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") ) { @@ -539,15 +621,15 @@ for ( C4::Context->preference("OPACShowHoldQueueDetails") ) { } 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; - 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 )); } } } @@ -561,19 +643,55 @@ if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) { $template->param(SeparateHoldings => 1); } my $separatebranch = C4::Context->preference('OpacSeparateHoldingsBranch'); -for my $itm (@items) { +my $viewallitems = $query->param('viewallitems'); +my $max_items_to_display = C4::Context->preference('OpacMaxItemsToDisplay') // 50; + +# Get items on order +my ( @itemnumbers_on_order ); +if ( C4::Context->preference('OPACAcquisitionDetails' ) ) { + my $orders = C4::Acquisition::SearchOrders({ + biblionumber => $biblionumber, + ordered => 1, + }); + 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'); + } + $total_quantity += $order->{quantity}; + } + $template->{VARS}->{acquisition_details} = { + total_quantity => $total_quantity, + }; +} + +my $allow_onshelf_holds; +if ( not $viewallitems and @items > $max_items_to_display ) { + $template->param( + too_many_items => 1, + items_count => scalar( @items ), + ); +} else { + 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 - if ( (not $itm->{'withdrawn'} ) - && (not $itm->{'itemlost'} ) - && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} ) - && (not $itemtypes->{$itm->{'itype'}}->{notforloan} ) - && ($itm->{'itemnumber'} ) ); + if $norequests + && !$itm->{'withdrawn'} + && !$itm->{'itemlost'} + && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'}) + && !$itemtypes->{$itm->{'itype'}}->{notforloan} + && $itm->{'itemnumber'}; + + $allow_onshelf_holds = Koha::IssuingRules->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($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'} ) { @@ -581,21 +699,12 @@ for my $itm (@items) { } if (exists $itm->{itype} && defined($itm->{itype}) && exists $itemtypes->{ $itm->{itype} }) { $itm->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} ); - $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{'description'}; + $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description}; } - foreach (qw(ccode enumchron copynumber itemnotes uri)) { + foreach (qw(ccode 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; } @@ -603,9 +712,15 @@ for my $itm (@items) { 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') ) { + $itm->{on_order} = 1 + if grep /^$itm->{itemnumber}$/, @itemnumbers_on_order; + } + my $itembranch = $itm->{$separatebranch}; if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) { if ($itembranch and $itembranch eq $currentbranch) { @@ -616,6 +731,11 @@ for my $itm (@items) { } else { push @itemloop, $itm; } + } +} + +if( $allow_onshelf_holds || CountItemsIssued($biblionumber) || $biblio->has_items_waiting_or_intransit ) { + $template->param( ReservableItems => 1 ); } # Display only one tab if one items list is empty @@ -626,44 +746,49 @@ if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) { } } -# If there is a lot of items, and the user has not decided -# to view them all yet, we first warn him -# TODO: The limit of 50 could be a syspref -my $viewallitems = $query->param('viewallitems'); -if (scalar(@itemloop) >= 50 && !$viewallitems) { - $template->param('lotsofholdingsitems' => 1); -} -if (scalar(@otheritemloop) >= 50 && !$viewallitems) { - $template->param('lotsofothersholdingsitems' => 1); +## get notes and subjects from MARC record +if (!C4::Context->preference("OPACXSLTDetailsDisplay") ) { + my $marcisbnsarray = GetMarcISBN ($record,$marcflavour); + my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour); + my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour); + my $marcseriesarray = GetMarcSeries ($record,$marcflavour); + my $marcurlsarray = GetMarcUrls ($record,$marcflavour); + my $marchostsarray = GetMarcHosts($record,$marcflavour); + + $template->param( + MARCSUBJCTS => $marcsubjctsarray, + MARCAUTHORS => $marcauthorsarray, + MARCSERIES => $marcseriesarray, + MARCURLS => $marcurlsarray, + MARCISBNS => $marcisbnsarray, + MARCHOSTS => $marchostsarray, + ); } -## get notes and subjects from MARC record -my $dbh = C4::Context->dbh; my $marcnotesarray = GetMarcNotes ($record,$marcflavour); -my $marcisbnsarray = GetMarcISBN ($record,$marcflavour); -my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour); -my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour); -my $marcseriesarray = GetMarcSeries ($record,$marcflavour); -my $marcurlsarray = GetMarcUrls ($record,$marcflavour); -my $marchostsarray = GetMarcHosts($record,$marcflavour); my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber)); +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, - MARCSUBJCTS => $marcsubjctsarray, - MARCAUTHORS => $marcauthorsarray, - MARCSERIES => $marcseriesarray, - MARCURLS => $marcurlsarray, - MARCISBNS => $marcisbnsarray, - MARCHOSTS => $marchostsarray, norequests => $norequests, RequestOnOpac => C4::Context->preference("RequestOnOpac"), itemdata_ccode => $itemfields{ccode}, itemdata_enumchron => $itemfields{enumchron}, itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, - itemdata_itemnotes => $itemfields{itemnotes}, - authorised_value_images => $biblio_authorised_value_images, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_location => $itemfields{location_description}, subtitle => $subtitle, OpacStarRatings => C4::Context->preference("OpacStarRatings"), ); @@ -695,7 +820,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->{$_} : '' ); } @@ -722,50 +849,51 @@ $template->param( ocoins => GetCOinSBiblio($record), ); -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('reviewson') ) { + $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("ISBD")) { - $template->param(ISBD => 1); +if ( C4::Context->preference("OPACISBD") ) { + $template->param( ISBD => 1 ); } $template->param( itemloop => \@itemloop, otheritemloop => \@otheritemloop, - subscriptionsnumber => $subscriptionsnumber, biblionumber => $biblionumber, subscriptions => \@subs, subscriptionsnumber => $subscriptionsnumber, @@ -774,17 +902,24 @@ $template->param( ); # Lists - if (C4::Context->preference("virtualshelves") ) { - $template->param( 'GetShelves' => GetBibliosShelves( $biblionumber ) ); + my $shelves = Koha::Virtualshelves->search( + { + biblionumber => $biblionumber, + category => 2, + }, + { + join => 'virtualshelfcontents', + } + ); + $template->param( shelves => $shelves ); } - # XISBN Stuff if (C4::Context->preference("OPACFRBRizeEditions")==1) { eval { $template->param( - XISBNS => get_xisbns($isbn) + XISBNS => scalar get_xisbns($isbn) ); }; if ($@) { warn "XISBN Failed $@"; } @@ -969,7 +1104,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) ); } @@ -994,19 +1129,14 @@ if (C4::Context->preference("OPACURLOpenInNewWindow")) { $template->param(covernewwindow => 'false'); } -#Export options -my $OpacExportOptions=C4::Context->preference("OpacExportOptions"); -my @export_options = split(/\|/,$OpacExportOptions); -$template->{VARS}->{'export_options'} = \@export_options; +$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, ); } @@ -1032,16 +1162,33 @@ if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){ $template->param('OPACSearchForTitleIn' => $search_for_title); } +#IDREF +if ( C4::Context->preference("IDREF") ) { + # If the record comes from the SUDOC + if ( $record->field('009') ) { + my $unimarc3 = $record->field("009")->data; + if ( $unimarc3 =~ /^\d+$/ ) { + $template->param( + IDREF => 1, + ); + } + } +} + # We try to select the best default tab to show, according to what # 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 @@ -1069,4 +1216,8 @@ if ( C4::Context->preference('UseCourseReserves') ) { } } +$template->param( + 'OpacLocationBranchToDisplay' => C4::Context->preference('OpacLocationBranchToDisplay'), +); + output_html_with_http_headers $query, $cookie, $template->output;