X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FXISBN.pm;h=e015ce31026d611d1511cbe3a6db0d4d74f20b8e;hb=6843f5a346da3d0c0e55b7168750190c9194297b;hp=1a177c18d265112037e23beb23ee6ca38e8ac148;hpb=faa9a396944953528c5edf56baa0fe5150d75840;p=srvgit

diff --git a/C4/XISBN.pm b/C4/XISBN.pm
index 1a177c18d2..e015ce3102 100644
--- a/C4/XISBN.pm
+++ b/C4/XISBN.pm
@@ -13,19 +13,21 @@ 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 {
@@ -34,24 +36,19 @@ BEGIN {
 	@ISA = qw(Exporter);
 	@EXPORT_OK = qw(
 		&get_xisbns
-		&get_biblio_from_xisbn
         &get_biblionumber_from_isbn
 	);
 }
 
 sub get_biblionumber_from_isbn {
     my $isbn = shift;
-    $isbn =~ /(\d*[X]*)/;
-    $isbn = $1;
+   	$isbn.='%';
     my @biblionumbers;
     my $dbh=C4::Context->dbh;
-    my $query = "SELECT biblionumber FROM biblioitems WHERE isbn=?";
+    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
 
@@ -63,18 +60,18 @@ 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.='%';
     my $dbh = C4::Context->dbh;
-    my $query = "SELECT biblionumber FROM biblioitems WHERE isbn=?";
+    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->{isbn} =~ /(\d*[X]*)/;
-        $xbiblio->{amazonisbn} = $1;
+        $xbiblio->{normalized_isbn} = GetNormalizedISBN($xbiblio->{isbn});
         $xbiblio->{items} = GetItemsByBiblioitemnumber($xbib_data->{biblionumber});
     }
     return ($xbiblio);
@@ -88,14 +85,22 @@ sub get_biblio_from_xisbn {
 
 sub get_xisbns {
     my ( $isbn ) = @_;
-    my ($response,$thing_response,$xisbn_response,$gapines_response);
-
+    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');
@@ -108,12 +113,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
 
@@ -123,8 +123,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;
 }