From 0d4107e572b551975fe42b5efdead3f57e0e3a64 Mon Sep 17 00:00:00 2001
From: Evan Leybourn <eleybourn@gmail.com>
Date: Tue, 7 Dec 2010 21:53:44 +1100
Subject: [PATCH] Ongoing work - broken committ

---
 .../AdministrationFunctions.java              |  5 +++--
 .../bookcatalogue/BookISBNSearch.java         | 21 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/com/eleybourn/bookcatalogue/AdministrationFunctions.java b/src/com/eleybourn/bookcatalogue/AdministrationFunctions.java
index bf625af..b005eb7 100644
--- a/src/com/eleybourn/bookcatalogue/AdministrationFunctions.java
+++ b/src/com/eleybourn/bookcatalogue/AdministrationFunctions.java
@@ -337,6 +337,7 @@ public class AdministrationFunctions extends Activity {
 					if (isbn.equals("")) {
 						// Must have an ISBN to be able to search
 						sendMessage(num, "Skip - " + title);
+						//TODO: searchGoogle(AUTHOR)
 					} else if (overwrite == true || !thumb.exists() || genre.equals("") || description.equals("")) {
 						sendMessage(num, title);
 						BookISBNSearch bis = new BookISBNSearch();
@@ -344,10 +345,10 @@ public class AdministrationFunctions extends Activity {
 						//	7=read, 8=series, 9=pages, 10=series_num, 11=list_price, 12=anthology, 13=location, 14=read_start, 
 						//	15=read_end, 16=audiobook, 17=signed, 18=description, 19=genre};
 						
-						book = bis.searchGoogle(isbn);
+						book = bis.searchGoogle(isbn, "", "");
 						File tmpthumb = CatalogueDBAdapter.fetchThumbnail(0);
 						
-						String[] bookAmazon = bis.searchAmazon(isbn);
+						String[] bookAmazon = bis.searchAmazon(isbn, "", "");
 						tmpthumb = CatalogueDBAdapter.fetchThumbnail(0);
 						/* Fill blank fields as required */
 						for (int i = 0; i<book.length; i++) {
diff --git a/src/com/eleybourn/bookcatalogue/BookISBNSearch.java b/src/com/eleybourn/bookcatalogue/BookISBNSearch.java
index 84f83b6..41cba87 100644
--- a/src/com/eleybourn/bookcatalogue/BookISBNSearch.java
+++ b/src/com/eleybourn/bookcatalogue/BookISBNSearch.java
@@ -221,9 +221,9 @@ public class BookISBNSearch extends Activity {
 			String[] bookAmazon;
 			
 			mIsbnStatus.append(this.getResources().getString(R.string.searching_google_books) + "\n");
-			book = searchGoogle(isbn);
+			book = searchGoogle(isbn, author, title);
 			mIsbnStatus.append(this.getResources().getString(R.string.searching_amazon_books) + "\n");
-			bookAmazon = searchAmazon(isbn);
+			bookAmazon = searchAmazon(isbn, author, title);
 			//Look for series in Title. e.g. Red Phoenix (Dark Heavens Trilogy)
 			book[8] = findSeries(book[1]);
 			bookAmazon[8] = findSeries(bookAmazon[1]);
@@ -276,8 +276,16 @@ public class BookISBNSearch extends Activity {
 		mDbHelper.close();
 	}
 	
-	public String[] searchGoogle(String mIsbn) {
-		String path = "http://books.google.com/books/feeds/volumes?q=ISBN";
+	public String[] searchGoogle(String mIsbn, String mAuthor, String mTitle) {
+		String path = "http://books.google.com/books/feeds/volumes";
+		String search_string = "";
+		if (mIsbn.equals("")) {
+			path += "?q=";
+			search_string = "intitle:\""+mTitle+"\"+inauthor:\""+mAuthor+"\"";
+		} else {
+			path += "?q=ISBN";
+			search_string = mIsbn;
+		}
 		URL url;
 		//String[] book = {author, title, isbn, publisher, date_published, rating,  bookshelf, read, series, pages, series_num, list_price, anthology, location, read_start, read_end, audiobook, signed, description, genre};
 		String[] book = {"", "", mIsbn, "", "", "0",  "", "", "", "", "", "", "0", "", "", "", "", "0", "", ""};
@@ -288,7 +296,7 @@ public class BookISBNSearch extends Activity {
 		SearchGoogleBooksEntryHandler entryHandler = new SearchGoogleBooksEntryHandler();
 
 		try {
-			url = new URL(path+mIsbn);
+			url = new URL(path+search_string);
 			parser = factory.newSAXParser();
 			int count = 0;
 			try {
@@ -329,7 +337,8 @@ public class BookISBNSearch extends Activity {
 	 * @param mIsbn The ISBN to search for
 	 * @return The book array
 	 */
-	public String[] searchAmazon(String mIsbn) {
+	public String[] searchAmazon(String mIsbn, String mAuthor, String mTitle) {
+		//TODO: mAuthor
 		//String[] book = {author, title, isbn, publisher, date_published, rating,  bookshelf, read, series, pages, series_num, list_price, anthology, location, read_start, read_end, audiobook, signed, description, genre};
 		String[] book = {"", "", mIsbn, "", "", "0",  "", "", "", "", "", "", "0", "", "", "", "", "0", "", ""};
 		String signedurl = "http://alphacomplex.org/getRest.php?isbn="+mIsbn;