diff --git a/dist/files_opds-0.5.3.tar.gz b/dist/files_opds-0.5.3.tar.gz new file mode 100644 index 0000000..6f78a9d Binary files /dev/null and b/dist/files_opds-0.5.3.tar.gz differ diff --git a/files_opds/appinfo/info.xml b/files_opds/appinfo/info.xml index eca3225..add8a9c 100644 --- a/files_opds/appinfo/info.xml +++ b/files_opds/appinfo/info.xml @@ -4,7 +4,7 @@ OPDS catalog Personal OPDS catalog AGPL - 0.5.2 + 0.5.3 Frank de Lange 7.0 true diff --git a/files_opds/lib/google.php b/files_opds/lib/google.php index 4de70ea..5554aa9 100644 --- a/files_opds/lib/google.php +++ b/files_opds/lib/google.php @@ -28,7 +28,7 @@ class Google $command = 'https://www.googleapis.com/books/v1/volumes?q=isbn:' . $isbn; $data = json_decode(file_get_contents($command),true); if($data['totalItems'] > 0) { - self::parse($isbn,$meta); + self::parse($data['items'][0]['volumeInfo'],$meta); return true; } else { $meta['rescan'] = date("Y-m-d\TH:i:sP", time() + Isbn::RESCAN_NOT_FOUND); diff --git a/files_opds/lib/isbn.php b/files_opds/lib/isbn.php index 9d0c1ce..208925a 100644 --- a/files_opds/lib/isbn.php +++ b/files_opds/lib/isbn.php @@ -88,8 +88,10 @@ class Isbn public static function get($isbn,&$meta) { /* set ISBN in metadata; can be overwritten later with ISBN13 */ $meta['isbn'] = $isbn; + /* try Google first, then ISBNdb */ + if (!(Isbn::SUCCESS == Google::get($isbn,$meta)) && (!(Isbn::SUCCESS == Isbndb::get($isbn,$meta)) )) { /* Try ISBNdb, then Google */ - if (!(Isbn::SUCCESS == Isbndb::get($isbn,$meta)) && (!(Isbn::SUCCESS == Google::get($isbn,$meta)))) { + //if (!(Isbn::SUCCESS == Isbndb::get($isbn,$meta)) && (!(Isbn::SUCCESS == Google::get($isbn,$meta)))) { return false; } else { return true;