X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=46f76fb496b3d323bae7d4d907ece71fcd87dc45;hb=25b2cd1c6526b10bc6a726c4ef8296b87a38de02;hp=cc22accfaf7a993e12ba053207bcc8e1fcc4c1ef;hpb=f7e8e2254116d5585a9c5433b3784436d36c8546;p=koha_fer diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index cc22accfaf..46f76fb496 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -50,6 +50,7 @@ use List::MoreUtils qw/any none/; use C4::Images; use Koha::DateUtils; use C4::HTML5Media; +use C4::CourseReserves qw(GetItemCourseReservesInfo); BEGIN { if (C4::Context->preference('BakerTaylorEnabled')) { @@ -69,9 +70,20 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( } ); -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 @@ -142,6 +154,7 @@ if ($session->param('busc')) { my $expanded_facet = $arrParamsBusc->{'expand'}; my $branches = GetBranches(); + my $itemtypes = GetItemTypes; my @servers; @servers = @{$arrParamsBusc->{'server'}} if $arrParamsBusc->{'server'}; @servers = ("biblioserver") unless (@servers); @@ -152,7 +165,7 @@ 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,$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; @@ -361,20 +374,21 @@ 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}; - $dataBiblioPaging = GetBiblioData($paging{'previous'}->{biblionumber}); + $numberBiblioPaging = $paging{'previous'}->{biblionumber}; + if ($numberBiblioPaging) { + $template->param( 'previousBiblionumber' => $numberBiblioPaging ); + $dataBiblioPaging = GetBiblioData($numberBiblioPaging); $template->param('previousTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging); } # Next biblio - if ($paging{'next'}->{biblionumber}) { - $next = 'opac-detail.pl?biblionumber=' . $paging{'next'}->{biblionumber}; - $dataBiblioPaging = GetBiblioData($paging{'next'}->{biblionumber}); + $numberBiblioPaging = $paging{'next'}->{biblionumber}; + if ($numberBiblioPaging) { + $template->param( 'nextBiblionumber' => $numberBiblioPaging ); + $dataBiblioPaging = GetBiblioData($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++) { @@ -396,8 +410,6 @@ $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) ); $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 @@ -420,9 +432,6 @@ foreach my $hostfield ( $record->field($analyticfield)) { 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; @@ -441,6 +450,41 @@ if ($hideitems) { @items = @all_items; } +my $branches = GetBranches(); +my $branch = ''; +if (C4::Context->userenv){ + $branch = C4::Context->userenv->{branch}; +} +if ( C4::Context->preference('HighlightOwnItemsOnOPAC') ) { + if ( + ( ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) && $branch ) + || + C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' + ) { + my $branchname; + if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { + $branchname = $branches->{$branch}->{'branchname'}; + } + elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { + $branchname = $branches->{ $ENV{'BRANCHCODE'} }->{'branchname'}; + } + + my @our_items; + my @other_items; + + foreach my $item ( @items ) { + if ( $item->{'branchname'} eq $branchname ) { + $item->{'this_branch'} = 1; + push( @our_items, $item ); + } else { + push( @other_items, $item ); + } + } + + @items = ( @our_items, @other_items ); + } +} + my $dat = &GetBiblioData($biblionumber); my $itemtypes = GetItemTypes(); @@ -496,8 +540,8 @@ 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; + 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) { @@ -511,7 +555,6 @@ if ( $show_holds_count || $show_priority) { $template->param( show_priority => $has_hold ) ; my $norequests = 1; -my $branches = GetBranches(); my %itemfields; my (@itemloop, @otheritemloop); my $currentbranch = C4::Context->userenv ? C4::Context->userenv->{branch} : undef; @@ -519,11 +562,19 @@ 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; +if ( not $viewallitems and @items > $max_items_to_display ) { + $template->param( + too_many_items => 1, + items_count => scalar( @items ), + ); +} else { + for my $itm (@items) { $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} ) @@ -531,7 +582,7 @@ for my $itm (@items) { # 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'} ) { @@ -554,7 +605,7 @@ for my $itm (@items) { $itm->{'lostimageurl'} = $lostimageinfo->{ 'imageurl' }; $itm->{'lostimagelabel'} = $lostimageinfo->{ 'label' }; } - my ($reserve_status) = C4::Reserves::CheckReserves($itm->{itemnumber}); + my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber}); if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; } if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; } @@ -574,14 +625,15 @@ for my $itm (@items) { } else { push @itemloop, $itm; } + } } -# 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('lotsofitems' => 1); +# Display only one tab if one items list is empty +if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) { + $template->param(SeparateHoldings => 0); + if (scalar(@itemloop) == 0) { + @itemloop = @otheritemloop; + } } ## get notes and subjects from MARC record @@ -879,19 +931,16 @@ if (C4::Context->preference("OPACShelfBrowser")) { 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 ? @@ -966,14 +1015,19 @@ my $marcissns = GetMarcISSN ( $record, $marcflavour ); my $issn = $marcissns->[0] || ''; if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){ - $dat->{author} ? $search_for_title =~ s/{AUTHOR}/$dat->{author}/g : $search_for_title =~ s/{AUTHOR}//g; $dat->{title} =~ s/\/+$//; # remove trailing slash $dat->{title} =~ s/\s+$//; # remove trailing space - $dat->{title} ? $search_for_title =~ s/{TITLE}/$dat->{title}/g : $search_for_title =~ s/{TITLE}//g; - $isbn ? $search_for_title =~ s/{ISBN}/$isbn/g : $search_for_title =~ s/{ISBN}//g; - $issn ? $search_for_title =~ s/{ISSN}/$issn/g : $search_for_title =~ s/{ISSN}//g; - $marccontrolnumber ? $search_for_title =~ s/{CONTROLNUMBER}/$marccontrolnumber/g : $search_for_title =~ s/{CONTROLNUMBER}//g; - $search_for_title =~ s/{BIBLIONUMBER}/$biblionumber/g; + $search_for_title = parametrized_url( + $search_for_title, + { + TITLE => $dat->{title}, + AUTHOR => $dat->{author}, + ISBN => $isbn, + ISSN => $issn, + CONTROLNUMBER => $marccontrolnumber, + BIBLIONUMBER => $biblionumber, + } + ); $template->param('OPACSearchForTitleIn' => $search_for_title); } @@ -1001,9 +1055,17 @@ if (C4::Context->preference('OPACLocalCoverImages') == 1) { $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')) { $template->{VARS}->{query_desc} = $query->param('query_desc'); } +$template->{VARS}->{'trackclicks'} = C4::Context->preference('TrackClicks'); + +if ( C4::Context->preference('UseCourseReserves') ) { + foreach my $i ( @items ) { + $i->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $i->{'itemnumber'} ); + } +} output_html_with_http_headers $query, $cookie, $template->output;