X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=22c922b02ca2cf9fa0a05abfb8f1f6ed8053249c;hb=5d7b5533f1565a55ff269fd82690a71a697901f1;hp=0bafabdce0dcfb265dcbfdd97b20af6e4f89df6e;hpb=87eae41e509a69e6698264a38d079c78ef2451cb;p=koha.git diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 0bafabdce0..22c922b02c 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -49,6 +49,7 @@ use MARC::Field; use List::MoreUtils qw/any none/; use C4::Images; use Koha::DateUtils; +use C4::HTML5Media; BEGIN { if (C4::Context->preference('BakerTaylorEnabled')) { @@ -69,6 +70,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $biblionumber = $query->param('biblionumber') || $query->param('bib'); +$biblionumber = int($biblionumber); my $record = GetMarcBiblio($biblionumber); if ( ! $record ) { @@ -157,8 +159,7 @@ if ($session->param('busc')) { for (my $i=0;$i<@servers;$i++) { my $server = $servers[$i]; $hits = $results_hashref->{$server}->{"hits"}; - my @records = $results_hashref->{$server}->{"RECORDS"}; - @newresults = searchResults('opac', '', $hits, $results_per_page, $offset, $arrParamsBusc->{'scan'}, \@records,, C4::Context->preference('hidelostitems')); + @newresults = searchResults('opac', '', $hits, $results_per_page, $offset, $arrParamsBusc->{'scan'}, $results_hashref->{$server}->{"RECORDS"}); } return \@newresults; }#searchAgain @@ -471,6 +472,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; @@ -482,13 +485,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 ) ); @@ -517,6 +513,12 @@ $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} }; @@ -567,6 +569,24 @@ 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; + } +} + +# 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 @@ -695,7 +715,8 @@ if(C4::Context->preference("ISBD")) { } $template->param( - ITEM_RESULTS => \@items, + itemloop => \@itemloop, + otheritemloop => \@otheritemloop, subscriptionsnumber => $subscriptionsnumber, biblionumber => $biblionumber, subscriptions => \@subs, @@ -723,6 +744,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) { @@ -730,9 +754,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); } } @@ -747,44 +777,9 @@ if (C4::Context->preference("OPACLocalCoverImages")){ $template->param(OPACLocalCoverImages => 1); } -# Amazon.com Stuff -if ( C4::Context->preference("OPACAmazonEnabled") ) { - $template->param( AmazonTld => get_amazon_tld() ); - my $amazon_reviews = C4::Context->preference("OPACAmazonReviews"); - my $amazon_similars = C4::Context->preference("OPACAmazonSimilarItems"); - my @services; - if ( $amazon_reviews ) { - push( @services, 'EditorialReview', 'Reviews' ); - } - if ( $amazon_similars ) { - push( @services, 'Similarities' ); - } - my $amazon_details = &get_amazon_details( $isbn, $record, $marcflavour, \@services ); - my $similar_products_exist; - if ( $amazon_reviews ) { - my $item = $amazon_details->{Items}->{Item}->[0]; - my $customer_reviews = \@{ $item->{CustomerReviews}->{Review} }; - my $editorial_reviews = \@{ $item->{EditorialReviews}->{EditorialReview} }; - my $average_rating = $item->{CustomerReviews}->{AverageRating} || 0; - $template->param( amazon_average_rating => $average_rating * 20); - $template->param( AMAZON_CUSTOMER_REVIEWS => $customer_reviews ); - $template->param( AMAZON_EDITORIAL_REVIEWS => $editorial_reviews ); - } - if ( $amazon_similars ) { - my $item = $amazon_details->{Items}->{Item}->[0]; - my @similar_products; - for my $similar_product (@{ $item->{SimilarProducts}->{SimilarProduct} }) { - # do we have any of these isbns in our collection? - my $similar_biblionumbers = get_biblionumber_from_isbn($similar_product->{ASIN}); - # verify that there is at least one similar item - if (scalar(@$similar_biblionumbers)){ - $similar_products_exist++ if ($similar_biblionumbers && $similar_biblionumbers->[0]); - push @similar_products, +{ similar_biblionumbers => $similar_biblionumbers, title => $similar_product->{Title}, ASIN => $similar_product->{ASIN} }; - } - } - $template->param( OPACAmazonSimilarItems => $similar_products_exist ); - $template->param( AMAZON_SIMILAR_PRODUCTS => \@similar_products ); - } +# 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; @@ -886,8 +881,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); @@ -904,9 +898,18 @@ 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'); + } } } +$template->param( AmazonTld => get_amazon_tld() ) if ( C4::Context->preference("OPACAmazonCoverImages")); + if (C4::Context->preference("BakerTaylorEnabled")) { $template->param( BakerTaylorEnabled => 1, @@ -987,7 +990,7 @@ 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' : @@ -1000,4 +1003,8 @@ if (C4::Context->preference('OPACLocalCoverImages') == 1) { $template->{VARS}->{localimages} = \@images; } +if (C4::Context->preference('OpacHighlightedWords')) { + $template->{VARS}->{query_desc} = $query->param('query_desc'); +} + output_html_with_http_headers $query, $cookie, $template->output;