From 4c92790fc08e7888d0a8fee057c5d98e942a6e5e Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Sun, 16 Mar 2008 13:26:50 -0400 Subject: [PATCH] IMPORTANT: Upgrading to Amazon.com Associates Web Service 4.0 As announced this past February, Amazon.com will no longer be accepting web services requests to Amazon E-Commerce Service (Amazon ECS) version 3.0 beginning on March 31, 2008. This patch upgrades to Amazon.com's Associates Web Service 4.0 for the following components: 1. Amazon.com Locale support for: Canada, Germany, France, Japan, UK, and US (see the new syspref called AmazonLocale) 2. Jacket Covers 3. Editorial Reviews 4. Customer Reviews 5. Amazon.com Similar Items The following changes MUST be made to continue using Amazon.com content: 1. Delete the system preference: AmazonDevKey (AmazonDevKeys used with AmazonECS 3.0 are no longer valid) 2. Add the system preferences: AmazonLocale, AWSAccessKeyID NOTE: steps 1, 2 are done by the web installer 3. Verify your AWSAccessKeyID: You may already have an Access Key ID. You can access your Access Key ID by going to http://aws.amazon.com, pointing to Your Web Services Account, then clicking View Access Key Identifiers. Depending on when you signed up for ECS 3.0, you may need to re-register for an AWS account, which includes an Access Key ID. 4. Enter your AWSAccessKeyID in the Koha syspref called AWSAccessKeyID For complete details on the changes in Amazon.com Associates Web Service 4.0, and the migration process, please see: http://tinyurl.com/ysorqy Other changes with this patch: * added $tabsysprefs{PatronsPerPage}="Patrons"; * Moved OPAC Features to OPAC in sysprefs * removed experimental OPACXISBNAmazonSimilarItems and XISBNAmazonSimilarItems features Signed-off-by: Joshua Ferraro --- C4/Amazon.pm | 51 ++++++---- C4/Auth.pm | 1 + C4/XISBN.pm | 13 +++ admin/systempreferences.pl | 60 ++++++------ catalogue/detail.pl | 57 ++++------- .../data/mysql/en/mandatory/sysprefs.sql | 15 ++- .../unimarc_standard_systemprefs.sql | 4 +- installer/data/mysql/updatedatabase.pl | 11 ++- .../prog/en/includes/sysprefs-menu.inc | 4 +- .../prog/en/modules/catalogue/detail.tmpl | 54 ++++++----- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 12 ++- .../prog/en/modules/opac-detail.tmpl | 94 +++++++++---------- kohaversion.pl | 2 +- opac/opac-detail.pl | 60 ++++-------- 14 files changed, 221 insertions(+), 217 deletions(-) diff --git a/C4/Amazon.pm b/C4/Amazon.pm index 19a92f6ce0..13c7f07c86 100644 --- a/C4/Amazon.pm +++ b/C4/Amazon.pm @@ -27,13 +27,13 @@ use strict; use vars qw($VERSION @ISA @EXPORT); BEGIN { - require Exporter; - $VERSION = 0.03; - @ISA = qw(Exporter); - @EXPORT = qw( - &get_amazon_details - &check_search_inside - ); + require Exporter; + $VERSION = 0.03; + @ISA = qw(Exporter); + @EXPORT = qw( + &get_amazon_details + &check_search_inside + ); } =head1 NAME @@ -52,25 +52,40 @@ This module provides facilities for retrieving Amazon.com content in Koha sub get_amazon_details { my ( $isbn ) = @_; + #normalize the ISBN + $isbn =~ s/(p|-|:| )//g; - #get rid of MARC cataloger's nonsense - $isbn =~ s/(p|-)//g; + # Determine which content to grab in the request - # grab the developer's key: mine is 'ektostoukadou-20' - my $dev_key=C4::Context->preference('AmazonDevKey'); + # Determine correct locale + my $locale_hashref = { + CA => '.ca', + DE => '.de', + FR => '.fr', + JP => '.jp', + UK => '.co.uk', + US => '.com', + }; - #grab the associates tag: mine is '0ZRY7YASKJS280T7YB02' - my $af_tag=C4::Context->preference('AmazonAssocTag'); + my $amazon_locale_syspref = C4::Context->preference('AmazonLocale'); + my $tld = $locale_hashref->{$amazon_locale_syspref} || '.com'; # default top level domain is .com + + # grab the AWSAccessKeyId: mine is '0V5RRRRJZ3HR2RQFNHR2' + my $aws_access_key_id = C4::Context->preference('AWSAccessKeyID'); + #grab the associates tag: mine is 'kadabox-20' + my $af_tag=C4::Context->preference('AmazonAssocTag'); + my $response_group = "Similarities,EditorialReview,Reviews,ItemAttributes"; my $asin=$isbn; - my $url = "http://xml.amazon.com/onca/xml3?t=$af_tag&dev-t=$dev_key&type=heavy&f=xml&AsinSearch=" . $asin; + my $url = "http://ecs.amazonaws$tld/onca/xml?Service=AWSECommerceService&AWSAccessKeyId=$aws_access_key_id&Operation=ItemLookup&AssociateTag=$af_tag&Version=2007-01-15&ItemId=$asin&ResponseGroup=$response_group"; + # warn $url; my $content = get($url); - #warn $content; warn "could not retrieve $url" unless $content; my $xmlsimple = XML::Simple->new(); - my $response = $xmlsimple->XMLin($content, - forcearray => [ qw(Details Product AvgCustomerRating CustomerReview) ], -); + my $response = $xmlsimple->XMLin( + $content, + forcearray => [ qw(SimilarProduct EditorialReview Review) ], + ); return $response; } diff --git a/C4/Auth.pm b/C4/Auth.pm index 495ae9a431..817ae2e0b8 100755 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -299,6 +299,7 @@ sub get_template_and_user { opacbookbag => "" . C4::Context->preference("opacbookbag"), TemplateEncoding => "". C4::Context->preference("TemplateEncoding"), AmazonContent => "" . C4::Context->preference("AmazonContent"), + OPACAmazonSimilarItems => "" . C4::Context->preference("OPACAmazonSimilarItems"), LibraryName => "" . C4::Context->preference("LibraryName"), LibraryNameTitle => "" . $LibraryNameTitle, LoginBranchcode => (C4::Context->userenv?C4::Context->userenv->{"branch"}:"insecure"), diff --git a/C4/XISBN.pm b/C4/XISBN.pm index 79b50f9cdb..dd2bd5da30 100644 --- a/C4/XISBN.pm +++ b/C4/XISBN.pm @@ -35,9 +35,22 @@ BEGIN { @EXPORT_OK = qw( &get_xisbns &get_biblio_from_xisbn + &get_biblionumber_from_isbn ); } +sub get_biblionumber_from_isbn { + my $isbn = shift; + my @biblionumbers; + my $dbh=C4::Context->dbh; + my $query = "SELECT biblionumber FROM biblioitems WHERE isbn=?"; + my $sth = $dbh->prepare($query); + $sth->execute($isbn); + while ( my $biblionumber = $sth->fetchrow_hashref() ) { + push (@biblionumbers, $biblionumber); + } + return \@biblionumbers; +} =head1 NAME C4::XISBN - Functions for retrieving XISBN content in Koha diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 8d6219f8f1..b7dce1fc7a 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -165,6 +165,7 @@ my %tabsysprefs; $tabsysprefs{NoReturnSetLost}="Patrons"; $tabsysprefs{MaxFine}="Patrons"; $tabsysprefs{NotifyBorrowerDeparture}="Patrons"; + $tabsysprefs{PatronsPerPage}="Patrons"; # FRBR $tabsysprefs{FRBRizeEditions}="FRBR"; @@ -174,7 +175,6 @@ my %tabsysprefs; $tabsysprefs{PINESISBN}="FRBR"; $tabsysprefs{ThingISBN}="FRBR"; $tabsysprefs{OPACFRBRizeEditions}="FRBR"; - $tabsysprefs{XISBNAmazonSimilarItems}="FRBR"; # I18N/L10N $tabsysprefs{dateformat}="I18N/L10N"; @@ -199,12 +199,16 @@ my %tabsysprefs; $tabsysprefs{QueryAutoTruncate}="Searching"; $tabsysprefs{QueryRemoveStopwords}="Searching"; +# Amazon.com + $tabsysprefs{AmazonContent}="Amazon"; + $tabsysprefs{AWSAccessKeyID}="Amazon"; + $tabsysprefs{AmazonLocale}="Amazon"; + $tabsysprefs{AmazonAssocTag}="Amazon"; + $tabsysprefs{AmazonSimilarItems}="Amazon"; + $tabsysprefs{OPACAmazonContent}="Amazon"; + $tabsysprefs{OPACAmazonSimilarItems}="Amazon"; + # OPAC - $tabsysprefs{AmazonAssocTag}="OPAC"; - $tabsysprefs{AmazonSimilarItems}="OPAC"; - $tabsysprefs{AmazonContent}="OPAC"; - $tabsysprefs{OPACAmazonContent}="OPAC"; - $tabsysprefs{AmazonDevKey}="OPAC"; $tabsysprefs{BiblioDefaultView}="OPAC"; $tabsysprefs{LibraryName}="OPAC"; $tabsysprefs{opaccolorstylesheet}="OPAC"; @@ -218,8 +222,6 @@ my %tabsysprefs; $tabsysprefs{opacuserjs}="OPAC"; $tabsysprefs{SubscriptionHistory}="OPAC"; $tabsysprefs{opacheader}="OPAC"; - $tabsysprefs{OPACAmazonSimilarItems}="OPAC"; - $tabsysprefs{OPACXISBNAmazonSimilarItems}="OPAC"; $tabsysprefs{hideBiblioNumber}="OPAC"; $tabsysprefs{noOPACUserLogin}="OPAC"; @@ -232,27 +234,27 @@ my %tabsysprefs; $tabsysprefs{OPACViewOthersSuggestions}="OPAC"; $tabsysprefs{URLLinkText}="OPAC"; -# OPACFeatures - $tabsysprefs{SearchMyLibraryFirst}="OPACFeatures"; - $tabsysprefs{Disable_Dictionary}="OPACFeatures"; - $tabsysprefs{hidelostitems}="OPACFeatures"; - $tabsysprefs{opacbookbag}="OPACFeatures"; - $tabsysprefs{opaclanguagesdisplay}="OPACFeatures"; - $tabsysprefs{OpacPasswordChange}="OPACFeatures"; - $tabsysprefs{opacreadinghistory}="OPACFeatures"; - $tabsysprefs{virtualshelves}="OPACFeatures"; - $tabsysprefs{RequestOnOpac}="OPACFeatures"; - $tabsysprefs{reviewson}="OPACFeatures"; - $tabsysprefs{OpacTopissues}="OPACFeatures"; - $tabsysprefs{OpacAuthorities}="OPACFeatures"; - $tabsysprefs{OpacCloud}="OPACFeatures"; - $tabsysprefs{opacuserlogin}="OPACFeatures"; - $tabsysprefs{AnonSuggestions}="OPACFeatures"; - $tabsysprefs{suggestion}="OPACFeatures"; - $tabsysprefs{OpacTopissue}="OPACFeatures"; - $tabsysprefs{OpacBrowser}="OPACFeatures"; - $tabsysprefs{kohaspsuggest} = "OPACFeatures"; - $tabsysprefs{OpacRenewalAllowed} = "OPACFeatures"; +# OPAC + $tabsysprefs{SearchMyLibraryFirst}="OPAC"; + $tabsysprefs{Disable_Dictionary}="OPAC"; + $tabsysprefs{hidelostitems}="OPAC"; + $tabsysprefs{opacbookbag}="OPAC"; + $tabsysprefs{opaclanguagesdisplay}="OPAC"; + $tabsysprefs{OpacPasswordChange}="OPAC"; + $tabsysprefs{opacreadinghistory}="OPAC"; + $tabsysprefs{virtualshelves}="OPAC"; + $tabsysprefs{RequestOnOpac}="OPAC"; + $tabsysprefs{reviewson}="OPAC"; + $tabsysprefs{OpacTopissues}="OPAC"; + $tabsysprefs{OpacAuthorities}="OPAC"; + $tabsysprefs{OpacCloud}="OPAC"; + $tabsysprefs{opacuserlogin}="OPAC"; + $tabsysprefs{AnonSuggestions}="OPAC"; + $tabsysprefs{suggestion}="OPAC"; + $tabsysprefs{OpacTopissue}="OPAC"; + $tabsysprefs{OpacBrowser}="OPAC"; + $tabsysprefs{kohaspsuggest} = "OPAC"; + $tabsysprefs{OpacRenewalAllowed} = "OPAC"; # LOGFeatures $tabsysprefs{CataloguingLog} = "LOGFeatures"; diff --git a/catalogue/detail.pl b/catalogue/detail.pl index ac596706df..bc251a3908 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -31,7 +31,7 @@ use C4::Branch; use C4::Reserves; use C4::Members; use C4::Serials; -use C4::XISBN qw(get_xisbns get_biblio_from_xisbn); +use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn get_biblio_from_xisbn); use C4::Amazon; # use Smart::Comments; @@ -190,45 +190,24 @@ if (C4::Context->preference("FRBRizeEditions")==1) { if ($@) { warn "XISBN Failed $@"; } } if ( C4::Context->preference("AmazonContent") == 1 ) { + my $similar_products_exist; my $amazon_details = &get_amazon_details( $xisbn ); - foreach my $result ( @{ $amazon_details->{Details} } ) { - $template->param( item_description => $result->{ProductDescription} ); - $template->param( image => $result->{ImageUrlMedium} ); - $template->param( list_price => $result->{ListPrice} ); - $template->param( amazon_url => $result->{url} ); + my $item_attributes = \%{$amazon_details->{Items}->{Item}->{ItemAttributes}}; + my $customer_reviews = \@{$amazon_details->{Items}->{Item}->{CustomerReviews}->{Review}}; + 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 + $similar_products_exist++ if ${@$similar_biblionumbers}[0]; + push @similar_products, +{ similar_biblionumbers => $similar_biblionumbers, title => $similar_product->{Title}, ASIN => $similar_product->{ASIN} }; } - - my @products; - my @reviews; - for my $details ( @{ $amazon_details->{Details} } ) { - - next unless $details->{SimilarProducts}; - for my $product ( @{ $details->{SimilarProducts}->{Product} } ) { - if (C4::Context->preference("AmazonSimilarItems") ) { - my @xisbns; - if (C4::Context->preference("XISBNAmazonSimilarItems") ) { - @xisbns = @{get_xisbns($product)}; - } - else { - push @xisbns, get_biblio_from_xisbn($product); - } - push @products, +{ product => \@xisbns }; - } - } - next unless $details->{Reviews}; - for my $product ( @{ $details->{Reviews}->{AvgCustomerRating} } ) { - $template->param( rating => $product * 20 ); - } - for my $reviews ( @{ $details->{Reviews}->{CustomerReview} } ) { - push @reviews, - +{ - summary => $reviews->{Summary}, - comment => $reviews->{Comment}, - }; - } - } - $template->param( SIMILAR_PRODUCTS => \@products ); - $template->param( AMAZONREVIEWS => \@reviews ); + my $editorial_reviews = \@{$amazon_details->{Items}->{Item}->{EditorialReviews}->{EditorialReview}}; + my $average_rating = $amazon_details->{Items}->{Item}->{CustomerReviews}->{AverageRating}; + $template->param( AmazonSimilarItems => $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 ); } - output_html_with_http_headers $query, $cookie, $template->output; diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 8bac4b1c1a..478ba8824b 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -1,13 +1,12 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('acquisitions','normal','Choose Normal, budget-based acquisitions, or Simple bibliographic-data acquisitions','simple|normal','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('advancedMARCeditor',0,'If ON, the MARC editor won\'t display field/subfield descriptions','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonContent',0,'Turn ON Amazon Content - You MUST set AmazonDevKey and AmazonAssocTag if enabled','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You MUST set AmazonDevKey and AmazonAssocTag if enabled','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACAmazonContent',0,'Turn ON Amazon Content in the OPAC - You MUST set AmazonDevKey and AmazonAssocTag if enabled','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACAmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You MUST set AmazonDevKey and AmazonAssocTag if enabled','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('XISBNAmazonSimilarItems',0,'If ON, Amazon Similar Items will be passed through XISBN to find all associated works','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACXISBNAmazonSimilarItems',0,'If ON, Amazon Similar Items in the OPAC will be passed through XISBN to find all associated works','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonDevKey','','See: aws-portal.amazon.com/gp/aws/developer/registration/index.html','','free'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: associates.amazon.com/gp/flex/associates/apply-login.html','','free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonContent',0,'Turn ON Amazon Content - You MUST set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You MUST set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACAmazonContent',0,'Turn ON Amazon Content in the OPAC - You MUST set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACAmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You MUST set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions',0,'Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index 39fa0ea624..b85cd9cf79 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -4,8 +4,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonSimilarItems','0','Active ou non les fonctions Amazon ''les lecteurs ayant acheté...'' - Vous DEVEZ définir AmazonDevKey et AmazonAssocTag si vous activez cette fonction','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACAmazonContent','0','Active ou non l''affichage du contenu Amazon à l''OPAC. - Vous DEVEZ définir AmazonDevKey et AmazonAssocTag si vous activez cette fonction','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACAmazonSimilarItems','0','Active ou non les fonctions Amazon ''Les lecteurs ayant acheté...'' - Vous DEVEZ définir AmazonDevKey et AmazonAssocTag si vous activez cette fonction','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('XISBNAmazonSimilarItems','0','Active ou non la transmission des documents similaires au service XISBN pour trouver tous les documents associés','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACXISBNAmazonSimilarItems','0','Active ou non pour l''OPAC la transmission des documents similaires au service XISBN pour trouver tous les documents associés','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonDevKey', '', 'Voir : aws-portal.amazon.com/gp/aws/developer/registration/index.html', '', ''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag', '', 'Voir : associates.amazon.com/gp/flex/associates/apply-login.html', '', ''); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions', '0', 'Si ce paramètre est activé, les adhérents peuvent saisir une suggestion d''achat même sans être identifiés', '', ''); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a82c0f96de..a66e2db62a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -1188,7 +1188,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } - +$DBversion = "3.00.00.064"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web Services','US|CA|DE|FR|JP|UK','Choice');"); + $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free');"); + $dbh->do("DELETE FROM `systempreferences` WHERE variable='AmazonDevKey';"); + $dbh->do("DELETE FROM `systempreferences` WHERE variable='XISBNAmazonSimilarItems';"); + $dbh->do("DELETE FROM `systempreferences` WHERE variable='OPACXISBNAmazonSimilarItems';"); + print "Upgrade to $DBversion done (IMPORTANT: Upgrading to Amazon.com Associates Web Service 4.0 ) "; + SetVersion ($DBversion); +} =item DropAllForeignKeys($table) Drop all foreign keys of the table $table diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc index 1413e1d11c..8464d79adf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc @@ -2,18 +2,18 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index 17eb485768..4855d97c7d 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -126,7 +126,7 @@ function verify_images() { @@ -242,17 +242,27 @@ function verify_images() {
- +
+ + + +

From :

+

+ + + + + -

- - - -

- - +

+ + + +

+ + +
-

Editions

    @@ -269,24 +279,18 @@ function verify_images() {
- - + diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index f562b12acf..285eb4368a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1240,14 +1240,20 @@ div#menu li.active a:hover { padding : 3px 3px .5em 1em; } -#starFull { +#similars { + text-align : left; + font-size : 95%; + padding : 3px 3px .5em 1em; +} + +span.starFull { background: url(../../images/bluestars.png) top left no-repeat; height: 25px; margin: 0; padding: 0; } -#starMT { +span.starMT { background: url(../../images/emptystars.png) top left no-repeat; height: 25px; margin: 0 3px 0 30px; @@ -1481,4 +1487,4 @@ a#Normalview, span#Normalview { a#MARCview, a#ISBDview, a#Normalview { background-color : #F3F3F3; border-left : 1px solid #E8E8E8; -} \ No newline at end of file +} diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index be6fb0c933..0784c99cc1 100755 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -27,7 +27,7 @@ -

By ">

+

By ">

[ @@ -67,8 +67,8 @@

Published by : - "> - + "> + () ,

@@ -111,7 +111,7 @@ |

-

Subject(s): "> |

+

Subject(s): "> |

@@ -192,6 +192,20 @@ " /> + + +
+

Similar Items

+
    + + +
  • img.01._SS50_.jpg" /> ">
    • + + +
+
+ + @@ -268,16 +282,26 @@
-Description (from Amazon.com):
- - -

- +
+ + + +

From :

+

+ + + + + + +

+

- + +
@@ -366,7 +390,7 @@