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

1. Fixed index creation code to loop through statements 

2. - Use two cursors rather than fetchBookByISBNOrCombo; faster on 
     big import.
   - Removed CatalogueDBAdapter.fetchBookByISBNOrCombo (no longer
     used)
   - Added CatalogueDBAdapter.fetchByAuthorAndTitle
3. - Left some (mostly commented out) debugging code for copying
     actual database file.
   - Added CatalogueDBAdapter.backupDbFile for debugging purposes
master
pjw 2011-01-25 14:20:26 +11:00
parent c28bd5f809
commit 45a1a30d78
4 changed files with 97 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
res/layout/administration_functions.xml
View File

@ -81,6 +81,27 @@
/>
</LinearLayout>
<!-- DEBUG ONLY!
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="5sp">
<ImageView android:id="@+id/backup_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@+android:drawable/ic_menu_gallery"
/>
<TextView android:id="@+id/backup_label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@+string/backup_database"
android:textAppearance="?android:attr/textAppearanceLarge"
android:paddingTop="5sp"
/>
</LinearLayout>
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"

1
res/values/strings.xml
View File

@ -150,4 +150,5 @@
<string name="menu_insert_name">Add by Name</string>
<string name="isbn_name_search_help">Adding books by ISBN is much more accurate than adding by author and title and is generally preferred. Please remember you can sometimes find the correct barcode on the inside front cover. \n\n</string>
<string name="help_click_here">Please click here to access the online help pages</string>
<string name="backup_database">Backup Database</string>
</resources>

27
src/com/eleybourn/bookcatalogue/AdministrationFunctions.java
View File

@ -189,7 +189,18 @@ public class AdministrationFunctions extends Activity {
return;
}
});
// // Debug ONLY!
// /* Backup Link */
// TextView backup = (TextView) findViewById(R.id.backup_label);
// backup.setOnClickListener(new OnClickListener() {
// @Override
// public void onClick(View v) {
// mDbHelper.backupDbFile();
// return;
// }
// });
/* Export Link */
TextView thumb = (TextView) findViewById(R.id.thumb_label);
thumb.setOnClickListener(new OnClickListener() {
@ -974,9 +985,17 @@ public class AdministrationFunctions extends Activity {
String author = family + ", " + given;
try {
if (id == 0) {
// Book is new. It does not exist in the current database
Cursor book = mDbHelper.fetchBookByISBNOrCombo(isbn, family, given, title);
int rows = book.getCount();
// ID is unknown, may be new. Check if it exists in the current database.
Cursor book = null;
int rows = 0;
if (isbn != "") {
book = mDbHelper.fetchBookByISBN(isbn);
rows = book.getCount();
}
if (rows == 0) {
book = mDbHelper.fetchByAuthorAndTitle(family, given, title);
rows = book.getCount();
}
if (rows != 0) {
book.moveToFirst();
// Its a new entry, but the ISBN exists

66
src/com/eleybourn/bookcatalogue/CatalogueDBAdapter.java
View File

@ -231,7 +231,8 @@ public class CatalogueDBAdapter {
db.execSQL(DATABASE_CREATE_LOAN);
db.execSQL(DATABASE_CREATE_ANTHOLOGY);
db.execSQL(DATABASE_CREATE_BOOK_BOOKSHELF_WEAK);
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
new File(Environment.getExternalStorageDirectory() + "/" + BookCatalogue.LOCATION + "/").mkdirs();
try {
new File(Environment.getExternalStorageDirectory() + "/" + BookCatalogue.LOCATION + "/.nomedia").createNewFile();
@ -239,7 +240,14 @@ public class CatalogueDBAdapter {
//error
}
}
private void createIndices(SQLiteDatabase db) {
String[] indices = DATABASE_CREATE_INDICES.split(";");
for (int i = 0; i < indices.length; i++) {
db.execSQL(indices[i]);
}
}
/**
* This function is called each time the database is upgraded. The function will run all
* upgrade scripts between the oldVersion and the newVersion.
@ -299,7 +307,7 @@ public class CatalogueDBAdapter {
if (curVersion == 20) {
curVersion++;
db.execSQL(DATABASE_CREATE_LOAN);
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
}
if (curVersion == 21) {
//do nothing
@ -336,7 +344,7 @@ public class CatalogueDBAdapter {
//do nothing
}
try {
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
} catch (Exception e) {
//do nothing
}
@ -398,7 +406,7 @@ public class CatalogueDBAdapter {
//do nothing
}
try {
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
} catch (Exception e) {
//do nothing
}
@ -505,7 +513,7 @@ public class CatalogueDBAdapter {
try {
db.execSQL(DATABASE_CREATE_BOOK_BOOKSHELF_WEAK);
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
db.execSQL("INSERT INTO " + DB_TB_BOOK_BOOKSHELF_WEAK + " (" + KEY_BOOK + ", " + KEY_BOOKSHELF + ") SELECT " + KEY_ROWID + ", " + KEY_BOOKSHELF + " FROM " + DB_TB_BOOKS + "");
db.execSQL("CREATE TABLE tmp1 AS SELECT _id, " + KEY_AUTHOR + ", " + KEY_TITLE + ", " + KEY_ISBN + ", " + KEY_PUBLISHER + ", " +
KEY_DATE_PUBLISHED + ", " + KEY_RATING + ", " + KEY_READ + ", " + KEY_SERIES + ", " + KEY_PAGES + ", " + KEY_SERIES_NUM + ", " + KEY_NOTES + ", " +
@ -616,7 +624,7 @@ public class CatalogueDBAdapter {
db.execSQL("DROP TABLE tmp3");
db.execSQL("DROP TABLE tmp4");
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
}
if (curVersion == 45) {
//do nothing
@ -645,7 +653,7 @@ public class CatalogueDBAdapter {
db.execSQL("delete from loan where loaned_to='null';");
db.execSQL("delete from loan where _id!=(select max(l2._id) from loan l2 where l2.book=loan.book);");
db.execSQL("delete from anthology where _id!=(select max(a2._id) from anthology a2 where a2.book=anthology.book AND a2.author=anthology.author AND a2.title=anthology.title);");
db.execSQL(DATABASE_CREATE_INDICES);
createIndices(db);
}
if (curVersion == 49) {
curVersion++;
@ -695,6 +703,34 @@ public class CatalogueDBAdapter {
}
}
// DEBUG ONLY!
/**
* Backup database file
* @throws Exception
*/
public void backupDbFile() {
try {
java.io.InputStream dbOrig = new java.io.FileInputStream(mDb.getPath());
File dir = new File(Environment.getExternalStorageDirectory() + "/" + BookCatalogue.LOCATION);
dir.mkdir();
// Path to the external backup
java.io.OutputStream dbCopy = new java.io.FileOutputStream(dir.getPath() + "/dbExport.db");
byte[] buffer = new byte[1024];
int length;
while ((length = dbOrig.read(buffer))>0) {
dbCopy.write(buffer, 0, length);
}
dbCopy.flush();
dbCopy.close();
dbOrig.close();
} catch (Exception e) {
//do nothing
}
}
/**
* return the thumbnail (as a File object) for the given id
*
@ -1457,17 +1493,19 @@ public class CatalogueDBAdapter {
}
/**
*
* @param isbn The isbn to search by
*
* @param family Family name of author
* @param given Given name of author
* @param title Title of book
* @return Cursor of the book
*/
public Cursor fetchBookByISBNOrCombo(String isbn, String family, String given, String title) {
String where = " AND ((b." + KEY_ISBN + "='" + encodeString(isbn) + "' AND b." + KEY_ISBN + "!='') OR " +
"(b." + KEY_TITLE + "='" + encodeString(title) + "' AND a." + KEY_FAMILY_NAME + "='" + encodeString(family) + "' AND a." + KEY_GIVEN_NAMES + "='" + encodeString(given) + "'))";
public Cursor fetchByAuthorAndTitle(String family, String given, String title) {
String where = " AND b." + KEY_TITLE + "='" + encodeString(title) + "' AND a." + KEY_FAMILY_NAME + "='" + encodeString(family)
+ "' AND a." + KEY_GIVEN_NAMES + "='" + encodeString(given) + "'";
String order = "lower(b." + KEY_TITLE + ")";
return fetchAllBooks(order, "All Books", where);
}
/**
* Return the position of a book in a list of all books (within a bookshelf)
*