X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=c29853f96a6eca82d1a001058cdf7f942536413f;hb=3b02ff1f3aed299e4bbec07cdf1554d1c84c8558;hp=7ba6c64875066819f40a5f3c154bcaf9ecae0342;hpb=042884e1995cf546bbac5ba77a349350d3042188;p=koha.git diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 7ba6c64875..c29853f96a 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -19,7 +19,8 @@ use strict; -require Exporter; +use warnings; + use CGI; use C4::Auth; use C4::Branch; @@ -32,7 +33,7 @@ use C4::Circulation; use C4::Tags qw(get_tags); use C4::Dates qw/format_date/; use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn get_biblio_from_xisbn); -use C4::Amazon; +use C4::External::Amazon; use C4::Review; use C4::Serials; use C4::Members; @@ -57,10 +58,11 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $biblionumber = $query->param('biblionumber') || $query->param('bib'); +my $record = GetMarcBiblio($biblionumber); $template->param( biblionumber => $biblionumber ); # XSLT processing of some stuff -if (C4::Context->preference("XSLTResultsDisplay") ) { - my $newxmlrecord = XSLTParse4Display($biblionumber,C4::Context->config('opachtdocs')."/prog/en/xslt/MARC21slim2OPACDetail.xsl"); +if (C4::Context->preference("XSLTDetailsDisplay") ) { + my $newxmlrecord = XSLTParse4Display($biblionumber,$record,'Detail'); $template->param('XSLTBloc' => $newxmlrecord); } @@ -81,12 +83,11 @@ if (!$dat) { print $query->redirect("/cgi-bin/koha/errors/404.pl"); exit; } -my $imgdir = getitemtypeimagesrc(); my $itemtypes = GetItemTypes(); # imageurl: my $itemtype = $dat->{'itemtype'}; if ( $itemtype ) { - $dat->{'imageurl'} = $imgdir."/".$itemtypes->{$itemtype}->{'imageurl'}; + $dat->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} ); $dat->{'description'} = $itemtypes->{$itemtype}->{'description'}; } my $shelflocations =GetKohaAuthorisedValues('items.location',$dat->{'frameworkcode'}); @@ -111,40 +112,40 @@ foreach my $subscription (@subscriptions) { $dat->{'count'} = scalar(@items); -#adding RequestOnOpac filter to allow or not the display of plce reserve button -# FIXME - use me or delete me. -my $RequestOnOpac; -if (C4::Context->preference("RequestOnOpac")) { - $RequestOnOpac = 1; -} - -my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $biblionumber ) ); +my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $biblionumber, $record ) ); my $norequests = 1; my $branches = GetBranches(); my %itemfields; for my $itm (@items) { - $norequests = 0 && $norequests + $norequests = 0 if ( (not $itm->{'wthdrawn'} ) && (not $itm->{'itemlost'} ) && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} ) && (not $itemtypes->{$itm->{'itype'}}->{notforloan} ) && ($itm->{'itemnumber'} ) ); - $itm->{ $itm->{'publictype'} } = 1; - $itm->{datedue} = format_date($itm->{datedue}); + if ( defined $itm->{'publictype'} ) { + # I can't actually find any case in which this is defined. --amoore 2008-12-09 + $itm->{ $itm->{'publictype'} } = 1; + } + $itm->{datedue} = format_date($itm->{datedue}); $itm->{datelastseen} = format_date($itm->{datelastseen}); - #get collection code description, too - my $ccode= $itm->{'ccode'}; - $itm->{'ccode'} = $collections->{$ccode} if(defined($collections) && exists($collections->{$ccode})); - $itm->{'location_description'} = $shelflocations->{$itm->{'location'} }; - $itm->{'imageurl'} = $imgdir."/".$itemtypes->{ $itm->{itype} }->{'imageurl'}; - $itm->{'description'} = $itemtypes->{$itemtype}->{'description'}; - $itemfields{ccode} = 1 if($itm->{ccode}); - $itemfields{enumchron} = 1 if($itm->{enumchron}); - $itemfields{copynumber} = 1 if($itm->{copynumber}); - $itemfields{itemnotes} = 1 if($itm->{itemnotes}); + # get collection code description, too + if ( my $ccode = $itm->{'ccode'} ) { + $itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) ); + } + if ( defined $itm->{'location'} ) { + $itm->{'location_description'} = $shelflocations->{ $itm->{'location'} }; + } + 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'}; + } + foreach (qw(ccode enumchron copynumber itemnotes 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'} ) ); @@ -156,9 +157,13 @@ for my $itm (@items) { $itm->{'lostimagelabel'} = $lostimageinfo->{ 'label' }; } + if( $itm->{'count_reserves'}){ + if( $itm->{'count_reserves'} eq "Waiting"){ $itm->{'waiting'} = 1; } + if( $itm->{'count_reserves'} eq "Reserved"){ $itm->{'onhold'} = 1; } + } my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber}); - if ( $transfertwhen ne '' ) { + if ( defined( $transfertwhen ) && $transfertwhen ne '' ) { $itm->{transfertwhen} = format_date($transfertwhen); $itm->{transfertfrom} = $branches->{$transfertfrom}{branchname}; $itm->{transfertto} = $branches->{$transfertto}{branchname}; @@ -168,7 +173,6 @@ for my $itm (@items) { ## get notes and subjects from MARC record my $dbh = C4::Context->dbh; my $marcflavour = C4::Context->preference("marcflavour"); -my $record = GetMarcBiblio($biblionumber); my $marcnotesarray = GetMarcNotes ($record,$marcflavour); my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour); my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour); @@ -183,9 +187,10 @@ my $subtitle = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 's MARCSERIES => $marcseriesarray, MARCURLS => $marcurlsarray, norequests => $norequests, - RequestOnOpac => $RequestOnOpac, + 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, @@ -193,17 +198,12 @@ my $subtitle = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 's ); foreach ( keys %{$dat} ) { - $template->param( "$_" => $dat->{$_} . "" ); + $template->param( "$_" => defined $dat->{$_} ? $dat->{$_} : '' ); } # COinS format FIXME: for books Only -my $coins_format; -my $fmt = substr $record->leader(), 6,2; -my $fmts; -$fmts->{'am'} = 'book'; -$coins_format = $fmts->{$fmt}; $template->param( - ocoins_format => $coins_format, + ocoins => GetCOinSBiblio($biblionumber), ); my $reviews = getreviews( $biblionumber, 1 ); @@ -239,6 +239,8 @@ $template->param( sub isbn_cleanup ($) { my $isbn=shift; + ($isbn) = $isbn =~ /([\d-]*[X]*)/; + $isbn =~ s/-//g; if ( $isbn =~ /\b(\d{13})\b/ or $isbn =~ /\b(\d{10})\b/ or @@ -251,8 +253,9 @@ sub isbn_cleanup ($) { # XISBN Stuff my $xisbn=$dat->{'isbn'}; -$xisbn =~ /(\d*[X]*)/; -$template->param(amazonisbn => $1); # FIXME: so it is OK if the ISBN = 'XXXXX' ? +(my $aisbn) = $xisbn =~ /([\d-]*[X]*)/; +$aisbn =~ s/-//g; +$template->param(amazonisbn => $aisbn); # FIXME: so it is OK if the ISBN = 'XXXXX' ? my ($clean,$clean2); # these might be overkill, but they are better than the regexp above. if ($clean = isbn_cleanup($xisbn)){ @@ -269,9 +272,12 @@ if (C4::Context->preference("OPACFRBRizeEditions")==1) { if ($@) { warn "XISBN Failed $@"; } } # Amazon.com Stuff -if ( C4::Context->preference("OPACAmazonContent") == 1 ) { +if ( C4::Context->preference("OPACAmazonEnabled") ) { + $template->param( AmazonTld => get_amazon_tld() ); +} +if ( C4::Context->preference("OPACAmazonEnabled") && C4::Context->preference("OPACAmazonSimilarItems") ) { my $similar_products_exist; - my $amazon_details = &get_amazon_details( $xisbn ); + my $amazon_details = &get_amazon_details( $xisbn, $record, $marcflavour ); my $item_attributes = \%{$amazon_details->{Items}->{Item}->{ItemAttributes}}; my $customer_reviews = \@{$amazon_details->{Items}->{Item}->{CustomerReviews}->{Review}}; for my $one_review (@$customer_reviews) { @@ -288,13 +294,21 @@ if ( C4::Context->preference("OPACAmazonContent") == 1 ) { } } my $editorial_reviews = \@{$amazon_details->{Items}->{Item}->{EditorialReviews}->{EditorialReview}}; - my $average_rating = $amazon_details->{Items}->{Item}->{CustomerReviews}->{AverageRating}; + my $average_rating = $amazon_details->{Items}->{Item}->{CustomerReviews}->{AverageRating} || 0; $template->param( OPACAmazonSimilarItems => $similar_products_exist ); $template->param( amazon_average_rating => $average_rating * 20); $template->param( AMAZON_CUSTOMER_REVIEWS => $customer_reviews ); $template->param( AMAZON_SIMILAR_PRODUCTS => \@similar_products ); $template->param( AMAZON_EDITORIAL_REVIEWS => $editorial_reviews ); } + +# Babelthèque +if ( C4::Context->preference("Babeltheque") ) { + $template->param( + Babeltheque => 1, + ); +} + # Shelf Browser Stuff if (C4::Context->preference("OPACShelfBrowser")) { # pick the first itemnumber unless one was selected by the user @@ -316,15 +330,28 @@ if (C4::Context->preference("OPACShelfBrowser")) { ## List of Previous Items # order by cn_sort, which should include everything we need for ordering purposes (though not # for limits, those need to be handled separately - my $sth_shelfbrowse_previous = $dbh->prepare(" + my $sth_shelfbrowse_previous; + if (defined $starting_location->{code}) { + $sth_shelfbrowse_previous = $dbh->prepare(" SELECT * FROM items WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?) AND homebranch = ? AND location = ? - ORDER BY cn_sort DESC, itemnumber ASC LIMIT 3 + ORDER BY cn_sort DESC, itemnumber LIMIT 3 "); - $sth_shelfbrowse_previous->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code}); + $sth_shelfbrowse_previous->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code}); + } else { + $sth_shelfbrowse_previous = $dbh->prepare(" + SELECT * + FROM items + WHERE + ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?) AND + homebranch = ? + ORDER BY cn_sort DESC, itemnumber LIMIT 3 + "); + $sth_shelfbrowse_previous->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}); + } my @previous_items; while (my $this_item = $sth_shelfbrowse_previous->fetchrow_hashref()) { my $sth_get_biblio = $dbh->prepare("SELECT biblio.*,biblioitems.isbn AS isbn FROM biblio LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber WHERE biblio.biblionumber=?"); @@ -338,20 +365,32 @@ if (C4::Context->preference("OPACShelfBrowser")) { } } unshift @previous_items, $this_item; - warn "p$this_item->{itemnumber}" . '@' . "$this_item->{biblionumber}: $this_item->{cn_sort}"; } - warn "p: " . (@previous_items ? 'yes' : 'no'); ## List of Next Items; this also intentionally catches the current item - my $sth_shelfbrowse_next = $dbh->prepare(" + my $sth_shelfbrowse_next; + if (defined $starting_location->{code}) { + $sth_shelfbrowse_next = $dbh->prepare(" SELECT * FROM items WHERE ((cn_sort = ? AND itemnumber >= ?) OR cn_sort > ?) AND homebranch = ? AND location = ? - ORDER BY cn_sort DESC, itemnumber ASC LIMIT 3 + ORDER BY cn_sort, itemnumber LIMIT 3 + "); + $sth_shelfbrowse_next->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code}); + } + else { + $sth_shelfbrowse_next = $dbh->prepare(" + SELECT * + FROM items + WHERE + ((cn_sort = ? AND itemnumber >= ?) OR cn_sort > ?) AND + homebranch = ? + ORDER BY cn_sort, itemnumber LIMIT 3 "); - $sth_shelfbrowse_next->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}, $starting_location->{code}); + $sth_shelfbrowse_next->execute($starting_cn_sort, $starting_itemnumber, $starting_cn_sort, $starting_homebranch->{code}); + } my @next_items; while (my $this_item = $sth_shelfbrowse_next->fetchrow_hashref()) { my $sth_get_biblio = $dbh->prepare("SELECT biblio.*,biblioitems.isbn AS isbn FROM biblio LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber WHERE biblio.biblionumber=?"); @@ -365,10 +404,9 @@ if (C4::Context->preference("OPACShelfBrowser")) { } } push @next_items, $this_item; - warn "n$this_item->{itemnumber}" . '@' . "$this_item->{biblionumber}: $this_item->{cn_sort}"; } - warn "n: " . (@next_items ? 'yes' : 'no'); - + + # alas, these won't auto-vivify, see http://www.perlmonks.org/?node_id=508481 my $shelfbrowser_next_itemnumber = $next_items[-1]->{itemnumber} if @next_items; my $shelfbrowser_next_biblionumber = $next_items[-1]->{biblionumber} if @next_items;