X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FXISBN.pm;h=c6e03d30710d8cae35ce40de6c393a41c0b9704e;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=13abf2543fc14beef738aa6770ffce8b461bcbe0;hpb=9eaf969dfd8c9281a0737458ab96d948daa15526;p=srvgit

diff --git a/C4/XISBN.pm b/C4/XISBN.pm
index 13abf2543f..c6e03d3071 100644
--- a/C4/XISBN.pm
+++ b/C4/XISBN.pm
@@ -4,51 +4,41 @@ package C4::XISBN;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
+use Modern::Perl;
 use XML::Simple;
 #use LWP::Simple;
 use C4::Biblio;
-use C4::Koha;
-use C4::External::Syndetics qw(get_syndetics_editions);
+use C4::Koha qw( GetNormalizedISBN );
+use C4::Search qw( new_record_from_zebra );
+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);
+use Koha::Biblios;
+use Koha::SearchEngine;
+use Koha::SearchEngine::Search;
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
-	require Exporter;
-	$VERSION = 3.01;
-	@ISA = qw(Exporter);
-	@EXPORT_OK = qw(
-		&get_xisbns
-        &get_biblionumber_from_isbn
-	);
+    require Exporter;
+    @ISA       = qw(Exporter);
+    @EXPORT_OK = qw(
+      get_xisbns
+    );
 }
 
-sub get_biblionumber_from_isbn {
-    my $isbn = shift;
-   	$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);
-	return $sth->fetchall_arrayref({});
-}
 =head1 NAME
 
 C4::XISBN - Functions for retrieving XISBN content in Koha
@@ -61,29 +51,33 @@ This module provides facilities for retrieving ThingISBN and XISBN content in Ko
 
 sub _get_biblio_from_xisbn {
     my $xisbn = shift;
-    $xisbn.='%';
     my $dbh = C4::Context->dbh;
-    my $query = "SELECT biblionumber FROM biblioitems WHERE isbn LIKE ?";
-    my $sth = $dbh->prepare($query);
-    $sth->execute($xisbn);
-    my $xbib_data =  $sth->fetchrow_hashref();
-    my $xbiblio;
-    if ($xbib_data->{biblionumber}) {
-        $xbiblio = GetBiblioData($xbib_data->{biblionumber});
-        $xbiblio->{normalized_isbn} = GetNormalizedISBN($xbiblio->{isbn});
-    }
-    return ($xbiblio);
+
+    my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
+    my ( $errors, $results, $total_hits ) = $searcher->simple_search_compat( "nb=$xisbn", 0, 1 );
+    return unless ( !$errors && scalar @$results );
+
+    my $record = C4::Search::new_record_from_zebra( 'biblioserver', $results->[0] );
+    my $biblionumber = C4::Biblio::TransformMarcToKohaOneField( 'biblio.biblionumber', $record );
+    return unless $biblionumber;
+
+    my $biblio = Koha::Biblios->find( $biblionumber );
+    return unless $biblio;
+    my $isbn = $biblio->biblioitem->isbn;
+    $biblio = $biblio->unblessed;
+    $biblio->{normalized_isbn} = GetNormalizedISBN($isbn);
+    return $biblio;
 }
 
-=head1 get_xisbns($isbn);
+=head1 get_xisbns($isbn, $biblionumber);
 
 =head2 $isbn is an ISBN string
 
 =cut
 
 sub get_xisbns {
-    my ( $isbn ) = @_;
-    my ($response,$thing_response,$xisbn_response,$syndetics_response);
+    my ( $isbn, $biblionumber ) = @_;
+    my ($response,$thing_response,$syndetics_response,$errors);
     # THINGISBN
     if ( C4::Context->preference('ThingISBN') ) {
         my $url = "http://www.librarything.com/api/thingISBN/".$isbn;
@@ -99,32 +93,24 @@ sub get_xisbns {
 		$syndetics_response = {isbn => \@syndetics_response};
 	}
 
-    # XISBN
-    if ( C4::Context->preference('XISBN') ) {
-        my $affiliate_id=C4::Context->preference('OCLCAffiliateID');
-        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;
-        unless ($reached_limit) {
-            $xisbn_response = _get_url($url,'xisbn');
-        }
-    }
-
-    $response->{isbn} = [ @{ $xisbn_response->{isbn} or [] },  @{ $syndetics_response->{isbn} or [] }, @{ $thing_response->{isbn} or [] } ];
+    $response->{isbn} = [ @{ $syndetics_response->{isbn} or [] }, @{ $thing_response->{isbn} or [] } ];
     my @xisbns;
     my $unique_xisbns; # a hashref
 
     # loop through each ISBN and scope to the local collection
     for my $response_data( @{ $response->{ isbn } } ) {
-        next if $response_data->{'content'} eq $isbn;
-        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;
+        next unless $xbiblio;
+        push @xisbns, $xbiblio if $xbiblio && $xbiblio->{biblionumber} ne $biblionumber;
+    }
+    if ( wantarray ) {
+        return (\@xisbns, $errors);
+    }
+    else {
+        return \@xisbns;
     }
-    return \@xisbns;
 }
 
 sub _get_url {
@@ -151,28 +137,6 @@ sub _get_url {
 
 }
 
-
-# Throttle services to the specified amount
-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=?");
-    $sth->execute($service_type);
-    my $count = 1;
-
-    while (my $counter = $sth->fetchrow_hashref()) {
-        $count = $counter->{service_count} if $counter->{service_count};
-    }
-
-    # we're over the limit
-    return 1 if $count >= $daily_limit;
-
-    # not over the limit
-    $count++;
-    $sth = $dbh->do("UPDATE services_throttle SET service_count=$count WHERE service_type='xisbn'");
-    return undef;
-}
-
 1;
 __END__