Bug 30077: (follow-up) retain branch selection

[koha-ffzg.git] / C4 / XISBN.pm

diff --git a/C4/XISBN.pm b/C4/XISBN.pm
index 7562d68..67d89ea 100644 (file)
--- a/C4/XISBN.pm
+++ b/C4/XISBN.pm
@@ -1,4 +1,5 @@
 package C4::XISBN;
+
 # Copyright (C) 2007 LibLime
 # Joshua Ferraro <jmf@liblime.com>
 #
@@ -17,29 +18,26 @@ package C4::XISBN;
 # 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::Search;
-use C4::External::Syndetics qw(get_syndetics_editions);
+
+use C4::Biblio qw(TransformMarcToKoha);
+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 Koha::Biblios;
 use Koha::SearchEngine;
 use Koha::SearchEngine::Search;
 
-use strict;
-#use warnings; FIXME - Bug 2505
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
-       require Exporter;
-       @ISA = qw(Exporter);
-       @EXPORT_OK = qw(
-               &get_xisbns
-       );
+    require Exporter;
+    @ISA       = qw(Exporter);
+    @EXPORT_OK = qw(
+      get_xisbns
+    );
 }
 
 =head1 NAME
@@ -61,7 +59,10 @@ sub _get_biblio_from_xisbn {
     return unless ( !$errors && scalar @$results );
 
     my $record = C4::Search::new_record_from_zebra( 'biblioserver', $results->[0] );
-    my $biblionumber = C4::Biblio::TransformMarcToKohaOneField( 'biblio.biblionumber', $record );
+    my $biblionumber = C4::Biblio::TransformMarcToKoha({
+        kohafields => ['biblio.biblionumber'],
+        record => $record
+    })->{biblionumber};
     return unless $biblionumber;
 
     my $biblio = Koha::Biblios->find( $biblionumber );
@@ -72,14 +73,14 @@ sub _get_biblio_from_xisbn {
     return $biblio;
 }
 
-=head1 get_xisbns($isbn);
+=head1 get_xisbns($isbn, $biblionumber);
 
 =head2 $isbn is an ISBN string
 
 =cut
 
 sub get_xisbns {
-    my ( $isbn ) = @_;
+    my ( $isbn, $biblionumber ) = @_;
     my ($response,$thing_response,$syndetics_response,$errors);
     # THINGISBN
     if ( C4::Context->preference('ThingISBN') ) {
@@ -102,12 +103,11 @@ sub get_xisbns {
 
     # 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);
@@ -141,34 +141,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(q{ SELECT service_count FROM services_throttle WHERE service_type=? });
-    $sth->execute($service_type);
-    my $count = 0;
-
-    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
-    return 1 if $count >= $daily_limit;
-
-    # not over the limit
-    $count++;
-    my $sth3 = $dbh->prepare(q{ UPDATE services_throttle SET service_count=? WHERE service_type=? });
-    $sth3->execute($count, $service_type);
-
-    return undef;
-}
-
 1;
 __END__