X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FXISBN.pm;h=8616c955fc693d08de0891e1a56bda521da182bf;hb=3ce542ce2668770a5669d2fb98b666f42a5bd388;hp=dd2bd5da30cb097d605eb3ba61267a029292b8f4;hpb=4c92790fc08e7888d0a8fee057c5d98e942a6e5e;p=srvgit

diff --git a/C4/XISBN.pm b/C4/XISBN.pm
index dd2bd5da30..8616c955fc 100644
--- a/C4/XISBN.pm
+++ b/C4/XISBN.pm
@@ -13,43 +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;
+   	$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
 
@@ -61,17 +59,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->{items} = GetItemsByBiblioitemnumber($xbib_data->{biblionumber});
+        $xbiblio->{normalized_isbn} = GetNormalizedISBN($xbiblio->{isbn});
     }
     return ($xbiblio);
 }
@@ -84,18 +83,26 @@ 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');
-        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;
@@ -104,21 +111,18 @@ 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
 
     # 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; #response_data->{xbiblio}; #->{biblionumber}; # if $xbiblionumber;
+        my $xbiblio= _get_biblio_from_xisbn($response_data->{content});
+        push @xisbns, $xbiblio if $xbiblio;
     }
     return \@xisbns;
 }
@@ -174,6 +178,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf@liblime.com>