X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-detail.pl;h=c928ddb69f465237cdb520f5fe430ca976afe3b4;hb=f278d41c838595bd3e3394190c5cc633aef95dc8;hp=7ba6c64875066819f40a5f3c154bcaf9ecae0342;hpb=042884e1995cf546bbac5ba77a349350d3042188;p=koha.git diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 7ba6c64875..c928ddb69f 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; @@ -31,8 +32,9 @@ use C4::Items; 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::XISBN qw(get_xisbns get_biblionumber_from_isbn); +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::Serials; use C4::Members; @@ -57,13 +59,15 @@ 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"); - $template->param('XSLTBloc' => $newxmlrecord); +if (C4::Context->preference("XSLTDetailsDisplay") ) { + $template->param( + 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail') ); } +$template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") ); # change back when ive fixed request.pl my @all_items = &GetItemsInfo( $biblionumber, 'opac' ); my @items; @@ -81,12 +85,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'}); @@ -95,56 +98,62 @@ my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'} #coping with subscriptions my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber); my @subscriptions = GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber ); + my @subs; $dat->{'serial'}=1 if $subscriptionsnumber; foreach my $subscription (@subscriptions) { + my $serials_to_display; my %cell; $cell{subscriptionid} = $subscription->{subscriptionid}; $cell{subscriptionnotes} = $subscription->{notes}; $cell{branchcode} = $subscription->{branchcode}; + $cell{branchname} = GetBranchName($subscription->{branchcode}); $cell{hasalert} = $subscription->{hasalert}; #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}, 3 ); + GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display ); push @subs, \%cell; } $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 +165,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 +181,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 +195,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 +206,28 @@ my $subtitle = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 's ); foreach ( keys %{$dat} ) { - $template->param( "$_" => $dat->{$_} . "" ); + $template->param( "$_" => defined $dat->{$_} ? $dat->{$_} : '' ); } +# some useful variables for enhanced content; +# in each case, we're grabbing the first value we find in +# the record and normalizing it +my $upc = GetNormalizedUPC($record,$marcflavour); +my $ean = GetNormalizedEAN($record,$marcflavour); +my $oclc = GetNormalizedOCLCNumber($record,$marcflavour); +my $isbn = GetNormalizedISBN(undef,$record,$marcflavour); +my $content_identifier_exists = 1 if ($isbn or $ean or $oclc or $upc); +$template->param( + normalized_upc => $upc, + normalized_ean => $ean, + normalized_oclc => $oclc, + normalized_isbn => $isbn, + content_identifier_exists => $content_identifier_exists, +); + # 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 ); @@ -215,6 +239,7 @@ foreach ( @$reviews ) { $_->{surname} = $borrowerData->{'surname'}; $_->{firstname} = $borrowerData->{'firstname'}; $_->{userid} = $borrowerData->{'userid'}; + $_->{cardnumber} = $borrowerData->{'cardnumber'}; $_->{datereviewed} = format_date($_->{datereviewed}); if ($borrowerData->{'borrowernumber'} eq $borrowernumber) { $_->{your_comment} = 1; @@ -237,64 +262,140 @@ $template->param( loggedincommenter => $loggedincommenter ); -sub isbn_cleanup ($) { - my $isbn=shift; - if ( - $isbn =~ /\b(\d{13})\b/ or - $isbn =~ /\b(\d{10})\b/ or - $isbn =~ /\b(\d{9}X)\b/i - ) { - return $1; - } - return undef; -} - # XISBN Stuff -my $xisbn=$dat->{'isbn'}; -$xisbn =~ /(\d*[X]*)/; -$template->param(amazonisbn => $1); # 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)){ - $template->param(clean_isbn => $clean); -} - if (C4::Context->preference("OPACFRBRizeEditions")==1) { eval { $template->param( - xisbn => $xisbn, - XISBNS => get_xisbns($xisbn) + XISBNS => get_xisbns($isbn) ); }; if ($@) { warn "XISBN Failed $@"; } } # Amazon.com Stuff -if ( C4::Context->preference("OPACAmazonContent") == 1 ) { +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 ) { + $template->param( OPACAmazonReviews => 1 ); + push( @services, 'EditorialReview', 'Reviews' ); + } + if ( $amazon_similars ) { + $template->param( OPACAmazonSimilarItems => 1 ); + push( @services, 'Similarities' ); + } + my $amazon_details = &get_amazon_details( $isbn, $record, $marcflavour, \@services ); my $similar_products_exist; - my $amazon_details = &get_amazon_details( $xisbn ); - my $item_attributes = \%{$amazon_details->{Items}->{Item}->{ItemAttributes}}; - my $customer_reviews = \@{$amazon_details->{Items}->{Item}->{CustomerReviews}->{Review}}; - for my $one_review (@$customer_reviews) { - $one_review->{Date} = format_date($one_review->{Date}); + if ( $amazon_reviews ) { + my $item = $amazon_details->{Items}->{Item}->[0]; + my $customer_reviews = \@{ $item->{CustomerReviews}->{Review} }; + for my $one_review ( @$customer_reviews ) { + $one_review->{Date} = format_date($one_review->{Date}); + } + 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 ); } - my @similar_products; - for my $similar_product (@{$amazon_details->{Items}->{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} }; + 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 ); } - my $editorial_reviews = \@{$amazon_details->{Items}->{Item}->{EditorialReviews}->{EditorialReview}}; - my $average_rating = $amazon_details->{Items}->{Item}->{CustomerReviews}->{AverageRating}; - $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 ); } + +my $syndetics_elements; + +if ( C4::Context->preference("SyndeticsEnabled") ) { + eval { + $syndetics_elements = &get_syndetics_index($isbn,$upc,$oclc); + for my $element (values %$syndetics_elements) { + $template->param("Syndetics$element"."Exists" => 1 ); + #warn "Exists: "."Syndetics$element"."Exists"; + } + }; + warn $@ if $@; +} + +if ( C4::Context->preference("SyndeticsEnabled") + && C4::Context->preference("SyndeticsSummary") + && ( exists($syndetics_elements->{'SUMMARY'}) || exists($syndetics_elements->{'AVSUMMARY'}) ) ) { + eval { + my $syndetics_summary = &get_syndetics_summary($isbn,$upc,$oclc, $syndetics_elements); + $template->param( SYNDETICS_SUMMARY => $syndetics_summary ); + }; + warn $@ if $@; + +} + +if ( C4::Context->preference("SyndeticsEnabled") + && C4::Context->preference("SyndeticsTOC") + && exists($syndetics_elements->{'TOC'}) ) { + eval { + my $syndetics_toc = &get_syndetics_toc($isbn,$upc,$oclc); + $template->param( SYNDETICS_TOC => $syndetics_toc ); + }; + warn $@ if $@; +} + +if ( C4::Context->preference("SyndeticsEnabled") + && C4::Context->preference("SyndeticsExcerpt") + && exists($syndetics_elements->{'DBCHAPTER'}) ) { + eval { + my $syndetics_excerpt = &get_syndetics_excerpt($isbn,$upc,$oclc); + $template->param( SYNDETICS_EXCERPT => $syndetics_excerpt ); + }; + warn $@ if $@; +} + +if ( C4::Context->preference("SyndeticsEnabled") + && C4::Context->preference("SyndeticsReviews")) { + eval { + my $syndetics_reviews = &get_syndetics_reviews($isbn,$upc,$oclc,$syndetics_elements); + $template->param( SYNDETICS_REVIEWS => $syndetics_reviews ); + }; + warn $@ if $@; +} + +if ( C4::Context->preference("SyndeticsEnabled") + && C4::Context->preference("SyndeticsAuthorNotes") + && exists($syndetics_elements->{'ANOTES'}) ) { + eval { + my $syndetics_anotes = &get_syndetics_anotes($isbn,$upc,$oclc); + $template->param( SYNDETICS_ANOTES => $syndetics_anotes ); + }; + warn $@ if $@; +} + +# LibraryThingForLibraries ID Code and Tabbed View Option +if( C4::Context->preference('LibraryThingForLibrariesEnabled') ) +{ +$template->param(LibraryThingForLibrariesID => +C4::Context->preference('LibraryThingForLibrariesID') ); +$template->param(LibraryThingForLibrariesTabbedView => +C4::Context->preference('LibraryThingForLibrariesTabbedView') ); +} + + +# 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,58 +417,78 @@ 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}); + } 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}, $starting_location->{code}); + $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=?"); $sth_get_biblio->execute($this_item->{biblionumber}); while (my $this_biblio = $sth_get_biblio->fetchrow_hashref()) { - $this_item->{'title'} = $this_biblio->{'title'}; - if ($clean2 = isbn_cleanup($this_biblio->{'isbn'})) { - $this_item->{'isbn'} = $clean2; - } else { - $this_item->{'isbn'} = $this_biblio->{'isbn'}; - } + $this_item->{'title'} = $this_biblio->{'title'}; + my $this_record = GetMarcBiblio($this_biblio->{'biblionumber'}); + $this_item->{'browser_normalized_upc'} = GetNormalizedUPC($this_record,$marcflavour); + $this_item->{'browser_normalized_oclc'} = GetNormalizedOCLCNumber($this_record,$marcflavour); + $this_item->{'browser_normalized_isbn'} = GetNormalizedISBN(undef,$this_record,$marcflavour); } 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=?"); $sth_get_biblio->execute($this_item->{biblionumber}); while (my $this_biblio = $sth_get_biblio->fetchrow_hashref()) { $this_item->{'title'} = $this_biblio->{'title'}; - if ($clean2 = isbn_cleanup($this_biblio->{'isbn'})) { - $this_item->{'isbn'} = $clean2; - } else { - $this_item->{'isbn'} = $this_biblio->{'isbn'}; - } + my $this_record = GetMarcBiblio($this_biblio->{'biblionumber'}); + $this_item->{'browser_normalized_upc'} = GetNormalizedUPC($this_record,$marcflavour); + $this_item->{'browser_normalized_oclc'} = GetNormalizedOCLCNumber($this_record,$marcflavour); + $this_item->{'browser_normalized_isbn'} = GetNormalizedISBN(undef,$this_record,$marcflavour); } 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; @@ -394,14 +515,14 @@ if (C4::Context->preference("BakerTaylorEnabled")) { BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), ); my ($bt_user, $bt_pass); - if ($clean and + if ($isbn and $bt_user = C4::Context->preference('BakerTaylorUsername') and $bt_pass = C4::Context->preference('BakerTaylorPassword') ) { $template->param( BakerTaylorContentURL => sprintf("http://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=%s&Password=%s&ItemKey=%s&Options=Y", - $bt_user,$bt_pass,$clean) + $bt_user,$bt_pass,$isbn) ); } }