CiaranG
/
Book-Catalogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fix

master
Evan Leybourn 2010-07-12 08:37:45 +10:00
parent b0c5a68204
commit 8cb131335c
3 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.eleybourn.bookcatalogue"
android:versionName="2.4" android:versionCode="24">
android:versionName="2.4a" android:versionCode="25">
<application android:label="@string/app_name" android:icon="@drawable/logo_bc">
<activity android:name=".BookCatalogue"
android:label="@string/app_name">

1
res/values/strings.xml
View File

@ -95,4 +95,5 @@
<string name="no">No</string>
<string name="ok">OK</string>
<string name="download_thumbs">Thumbnails are being downloaded in the background</string>
<string name="search_fail">Searching for the book failed. Please check your network settings.</string>
</resources>

58
src/com/eleybourn/bookcatalogue/BookISBNSearch.java
View File

@ -120,34 +120,40 @@ public class BookISBNSearch extends Activity {
// do nothing - this is the expected behaviour
}
/* Get the book */
String[] book;
String[] bookAmazon;
book = searchGoogle(isbn);
bookAmazon = searchAmazon(isbn);
//Look for series in Title. e.g. Red Phoenix (Dark Heavens Trilogy)
book[8] = findSeries(book[1]);
bookAmazon[8] = findSeries(bookAmazon[1]);
/* Fill blank fields as required */
for (int i = 0; i<book.length; i++) {
if (book[i] == "" || book[i] == "0") {
book[i] = bookAmazon[i];
try {
String[] book;
String[] bookAmazon;
book = searchGoogle(isbn);
bookAmazon = searchAmazon(isbn);
//Look for series in Title. e.g. Red Phoenix (Dark Heavens Trilogy)
book[8] = findSeries(book[1]);
bookAmazon[8] = findSeries(bookAmazon[1]);
/* Fill blank fields as required */
for (int i = 0; i<book.length; i++) {
if (book[i] == "" || book[i] == "0") {
book[i] = bookAmazon[i];
}
}
/* Format the output
* String[] book = {author, title, isbn, publisher, date_published, rating, bookshelf, read, series, pages, series_num, list_price};
*/
if (book[0] == "" && book[1] == "") {
Toast.makeText(this, R.string.book_not_found, Toast.LENGTH_LONG).show();
} else {
book[0] = properCase(book[0]); // author
book[1] = properCase(book[1]); // title
book[3] = properCase(book[3]); // publisher
book[4] = convertDate(book[4]); // date_published
book[8] = properCase(book[8]); // series
}
createBook(book);
} catch (Exception e) {
Toast.makeText(this, R.string.search_fail, Toast.LENGTH_LONG).show();
finish();
return;
}
/* Format the output
* String[] book = {author, title, isbn, publisher, date_published, rating, bookshelf, read, series, pages, series_num, list_price};
*/
if (book[0] == "" && book[1] == "") {
Toast.makeText(this, R.string.book_not_found, Toast.LENGTH_LONG).show();
} else {
book[0] = properCase(book[0]); // author
book[1] = properCase(book[1]); // title
book[3] = properCase(book[3]); // publisher
book[4] = convertDate(book[4]); // date_published
book[8] = properCase(book[8]); // series
}
createBook(book);
}
@Override