X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=eb6b77f87b0a4a3c940faa022b3a3ac3246edacb;hb=e191bb02bfda7f17ae8b4f681314c51d2e7e6b92;hp=feaa89b33c76e0a588d78eaef9ab7b86ba59401a;hpb=374b6f4b9f33a776d04cdaa696b40e8e033dda32;p=koha.git diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index feaa89b33c..eb6b77f87b 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -49,6 +49,8 @@ use MARC::Field; 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')) { @@ -68,7 +70,19 @@ 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 ) { @@ -362,13 +376,13 @@ if ($session->param('busc')) { my ($previous, $next, $dataBiblioPaging); # Previous biblio if ($paging{'previous'}->{biblionumber}) { - $previous = 'opac-detail.pl?biblionumber=' . $paging{'previous'}->{biblionumber}; + $previous = 'opac-detail.pl?biblionumber=' . $paging{'previous'}->{biblionumber} . '&query_desc=' . $query->param('query_desc'); $dataBiblioPaging = GetBiblioData($paging{'previous'}->{biblionumber}); $template->param('previousTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging); } # Next biblio if ($paging{'next'}->{biblionumber}) { - $next = 'opac-detail.pl?biblionumber=' . $paging{'next'}->{biblionumber}; + $next = 'opac-detail.pl?biblionumber=' . $paging{'next'}->{biblionumber} . '&query_desc=' . $query->param('query_desc'); $dataBiblioPaging = GetBiblioData($paging{'next'}->{biblionumber}); $template->param('nextTitle' => $dataBiblioPaging->{'title'}) if ($dataBiblioPaging); } @@ -394,8 +408,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 @@ -418,9 +430,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; @@ -439,6 +448,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(); @@ -470,6 +514,8 @@ foreach my $subscription (@subscriptions) { $cell{branchcode} = $subscription->{branchcode}; $cell{branchname} = GetBranchName($subscription->{branchcode}); $cell{hasalert} = $subscription->{hasalert}; + $cell{callnumber} = $subscription->{callnumber}; + $cell{closed} = $subscription->{closed}; #get the three latest serials. $serials_to_display = $subscription->{opacdisplaycount}; $serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display; @@ -481,13 +527,6 @@ foreach my $subscription (@subscriptions) { $dat->{'count'} = scalar(@items); -# 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 ($dat->{'count'} >= 50 && !$viewallitems) { - $template->param('lotsofitems' => 1); -} my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $biblionumber, $record ) ); @@ -514,23 +553,23 @@ 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; +if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) { + $template->param(SeparateHoldings => 1); +} +my $separatebranch = C4::Context->preference('OpacSeparateHoldingsBranch'); 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} ) && ($itm->{'itemnumber'} ) ); - if ( defined $itm->{'publictype'} ) { - # I can't actually find any case in which this is defined. --amoore 2008-12-09 - $itm->{ $itm->{'publictype'} } = 1; - } - # get collection code description, too my $ccode = $itm->{'ccode'}; $itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) ); @@ -556,7 +595,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; } @@ -566,6 +605,32 @@ for my $itm (@items) { $itm->{transfertfrom} = $branches->{$transfertfrom}{branchname}; $itm->{transfertto} = $branches->{$transfertto}{branchname}; } + my $itembranch = $itm->{$separatebranch}; + if ($currentbranch and C4::Context->preference('OpacSeparateHoldings')) { + if ($itembranch and $itembranch eq $currentbranch) { + push @itemloop, $itm; + } else { + push @otheritemloop, $itm; + } + } else { + push @itemloop, $itm; + } +} + +# 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; + } +} + +# 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); } ## get notes and subjects from MARC record @@ -694,7 +759,8 @@ if(C4::Context->preference("ISBD")) { } $template->param( - ITEM_RESULTS => \@items, + itemloop => \@itemloop, + otheritemloop => \@otheritemloop, subscriptionsnumber => $subscriptionsnumber, biblionumber => $biblionumber, subscriptions => \@subs, @@ -722,6 +788,9 @@ if (C4::Context->preference("OPACFRBRizeEditions")==1) { # Serial Collection my @sc_fields = $record->field(955); +my @lc_fields = $marcflavour eq 'UNIMARC' + ? $record->field(930) + : $record->field(852); my @serialcollections = (); foreach my $sc_field (@sc_fields) { @@ -729,9 +798,15 @@ foreach my $sc_field (@sc_fields) { $row_data{text} = $sc_field->subfield('r'); $row_data{branch} = $sc_field->subfield('9'); + foreach my $lc_field (@lc_fields) { + $row_data{itemcallnumber} = $marcflavour eq 'UNIMARC' + ? $lc_field->subfield('a') # 930$a + : $lc_field->subfield('h') # 852$h + if ($sc_field->subfield('5') eq $lc_field->subfield('5')); + } if ($row_data{text} && $row_data{branch}) { - push (@serialcollections, \%row_data); + push (@serialcollections, \%row_data); } } @@ -746,6 +821,11 @@ if (C4::Context->preference("OPACLocalCoverImages")){ $template->param(OPACLocalCoverImages => 1); } +# HTML5 Media +if ( (C4::Context->preference("HTML5MediaEnabled") eq 'both') or (C4::Context->preference("HTML5MediaEnabled") eq 'opac') ) { + $template->param( C4::HTML5Media->gethtml5media($record)); +} + my $syndetics_elements; if ( C4::Context->preference("SyndeticsEnabled") ) { @@ -845,8 +925,7 @@ if ( C4::Context->preference( "SocialNetworks" ) ) { # Shelf Browser Stuff if (C4::Context->preference("OPACShelfBrowser")) { - # pick the first itemnumber unless one was selected by the user - my $starting_itemnumber = $query->param('shelfbrowse_itemnumber'); # || $items[0]->{itemnumber}; + my $starting_itemnumber = $query->param('shelfbrowse_itemnumber'); if (defined($starting_itemnumber)) { $template->param( OpenOPACShelfBrowser => 1) if $starting_itemnumber; my $nearby = GetNearbyItems($starting_itemnumber,3); @@ -863,6 +942,13 @@ if (C4::Context->preference("OPACShelfBrowser")) { PREVIOUS_SHELF_BROWSE => $nearby->{prev}, NEXT_SHELF_BROWSE => $nearby->{next}, ); + + # in which tab shelf browser should open ? + if (grep { $starting_itemnumber == $_->{itemnumber} } @itemloop) { + $template->param(shelfbrowser_tab => 'holdings'); + } else { + $template->param(shelfbrowser_tab => 'otherholdings'); + } } } @@ -929,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); } @@ -948,12 +1039,12 @@ my $defaulttab = ? 'subscriptions' : $opac_serial_default eq 'serialcollection' && @serialcollections > 0 ? 'serialcollection' : - $opac_serial_default eq 'holdings' && $dat->{'count'} > 0 + $opac_serial_default eq 'holdings' && scalar (@itemloop) > 0 ? 'holdings' : $subscriptionsnumber ? 'subscriptions' : @serialcollections > 0 - ? 'serialcollection' : 'subscription'; + ? 'serialcollection' : 'subscriptions'; $template->param('defaulttab' => $defaulttab); if (C4::Context->preference('OPACLocalCoverImages') == 1) { @@ -961,8 +1052,20 @@ if (C4::Context->preference('OPACLocalCoverImages') == 1) { $template->{VARS}->{localimages} = \@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')) { $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;