X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=C4%2FXISBN.pm;h=12025f8857e23f6f3c6f5da767bf5ef127423e2c;hb=596f7a740eb7bb37cd727181f2b6894fefbacf9d;hp=11bc2c77a3131b9ec98d8f4308facc2c76277aeb;hpb=2a092b710babdc0d01178bf32352da650234f9d0;p=koha_fer diff --git a/C4/XISBN.pm b/C4/XISBN.pm index 11bc2c77a3..12025f8857 100644 --- a/C4/XISBN.pm +++ b/C4/XISBN.pm @@ -13,46 +13,41 @@ package C4::XISBN; # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use XML::Simple; #use LWP::Simple; use C4::Biblio; -use C4::Items; - +use C4::Koha; +use C4::External::Syndetics qw(get_syndetics_editions); use LWP::UserAgent; use HTTP::Request::Common; use strict; +#use warnings; FIXME - Bug 2505 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); BEGIN { require Exporter; - $VERSION = 3.01; + $VERSION = 3.07.00.049; @ISA = qw(Exporter); @EXPORT_OK = qw( &get_xisbns - &get_biblio_from_xisbn &get_biblionumber_from_isbn ); } sub get_biblionumber_from_isbn { my $isbn = shift; - if ($isbn =~ /(\d{9,}[X]*)/) { - $isbn = $1.'%'; - } + $isbn.='%'; my @biblionumbers; my $dbh=C4::Context->dbh; my $query = "SELECT biblionumber FROM biblioitems WHERE isbn LIKE ? LIMIT 10"; my $sth = $dbh->prepare($query); $sth->execute($isbn); - while ( my $biblionumber = $sth->fetchrow_hashref() ) { - push (@biblionumbers, $biblionumber); - } - return \@biblionumbers; + return $sth->fetchall_arrayref({}); } =head1 NAME @@ -64,9 +59,9 @@ This module provides facilities for retrieving ThingISBN and XISBN content in Ko =cut -sub get_biblio_from_xisbn { +sub _get_biblio_from_xisbn { my $xisbn = shift; - $xisbn .='%' if ($xisbn =~ /(\d{9,}[X]*)/); + $xisbn.='%'; my $dbh = C4::Context->dbh; my $query = "SELECT biblionumber FROM biblioitems WHERE isbn LIKE ?"; my $sth = $dbh->prepare($query); @@ -75,9 +70,7 @@ sub get_biblio_from_xisbn { my $xbiblio; if ($xbib_data->{biblionumber}) { $xbiblio = GetBiblioData($xbib_data->{biblionumber}); - $xbiblio->{isbn} =~ /(\d{9,}[X]*)/; - $xbiblio->{amazonisbn} = $1; - $xbiblio->{items} = GetItemsByBiblioitemnumber($xbib_data->{biblionumber}); + $xbiblio->{normalized_isbn} = GetNormalizedISBN($xbiblio->{isbn}); } return ($xbiblio); } @@ -90,19 +83,26 @@ sub get_biblio_from_xisbn { sub get_xisbns { my ( $isbn ) = @_; - my ($response,$thing_response,$xisbn_response,$gapines_response); - $isbn =~ /(\d{9,}[X]*)/; - $isbn = $1; + my ($response,$thing_response,$xisbn_response,$syndetics_response); # THINGISBN if ( C4::Context->preference('ThingISBN') ) { my $url = "http://www.librarything.com/api/thingISBN/".$isbn; $thing_response = _get_url($url,'thingisbn'); } + if ( C4::Context->preference("SyndeticsEnabled") && C4::Context->preference("SyndeticsEditions") ) { + my $syndetics_preresponse = &get_syndetics_editions($isbn); + my @syndetics_response; + for my $response (@$syndetics_preresponse) { + push @syndetics_response, {content => $response->{a}}; + } + $syndetics_response = {isbn => \@syndetics_response}; + } + # XISBN if ( C4::Context->preference('XISBN') ) { my $affiliate_id=C4::Context->preference('OCLCAffiliateID'); - my $limit = C4::Context->preference('XISBNDailyLimit') || 499; + my $limit = C4::Context->preference('XISBNDailyLimit') || 999; my $reached_limit = _service_throttle('xisbn',$limit); my $url = "http://xisbn.worldcat.org/webservices/xid/isbn/".$isbn."?method=getEditions&format=xml&fl=form,year,lang,ed"; $url.="&ai=".$affiliate_id if $affiliate_id; @@ -111,12 +111,7 @@ sub get_xisbns { } } - # PINES ISBN (Experimental) - #if ( C4::Context->preference('PINESISBN') ) { - # my $url = "http://www.librarything.com/api/thingISBN/".$isbn; - # $gapines_response = _get_url($url,'thingisbn'); - #} - $response->{isbn} = [ @{ $xisbn_response->{isbn} or [] }, @{ $thing_response->{isbn} or [] }, @{ $gapines_response->{isbn} or [] } ]; + $response->{isbn} = [ @{ $xisbn_response->{isbn} or [] }, @{ $syndetics_response->{isbn} or [] }, @{ $thing_response->{isbn} or [] } ]; my @xisbns; my $unique_xisbns; # a hashref @@ -126,8 +121,8 @@ sub get_xisbns { next if $isbn eq $response_data; next if $unique_xisbns->{ $response_data->{content} }; $unique_xisbns->{ $response_data->{content} }++; - my $xbiblio= get_biblio_from_xisbn($response_data->{content}); - push @xisbns, $xbiblio if $xbiblio; #response_data->{xbiblio}; #->{biblionumber}; # if $xbiblionumber; + my $xbiblio= _get_biblio_from_xisbn($response_data->{content}); + push @xisbns, $xbiblio if $xbiblio; } return \@xisbns; } @@ -161,12 +156,16 @@ sub _get_url { sub _service_throttle { my ($service_type,$daily_limit) = @_; my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("SELECT service_count FROM services_throttle WHERE service_type=?"); + my $sth = $dbh->prepare(q{ SELECT service_count FROM services_throttle WHERE service_type=? }); $sth->execute($service_type); - my $count = 1; + my $count = 0; - while (my $counter = $sth->fetchrow_hashref()) { - $count = $counter->{service_count} if $counter->{service_count}; + if ($sth->rows == 0) { + # initialize services throttle + my $sth2 = $dbh->prepare(q{ INSERT INTO services_throttle (service_type, service_count) VALUES (?, ?) }); + $sth2->execute($service_type, $count); + } else { + $count = $sth->fetchrow_array; } # we're over the limit @@ -174,7 +173,9 @@ sub _service_throttle { # not over the limit $count++; - $sth = $dbh->do("UPDATE services_throttle SET service_count=$count WHERE service_type='xisbn'"); + my $sth3 = $dbh->prepare(q{ UPDATE services_throttle SET service_count=? WHERE service_type=? }); + $sth3->execute($count, $service_type); + return undef; } @@ -183,6 +184,8 @@ __END__ =head1 NOTES +=cut + =head1 AUTHOR Joshua Ferraro