yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

listAuthors() method (with no parameters)

Browse source
This commit is contained in:
Nikolay Pultsin 2013-02-02 09:27:02 +00:00
parent 60985acfce
commit 6939ffc373
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
View file

@ -367,7 +367,21 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
myInsertBookAuthorStatement.execute();
}
protected List<Author> loadAuthors(long bookId) {
protected List<Author> listAuthors() {
final Cursor cursor = myDatabase.rawQuery("SELECT name,sort_key FROM Authors", null);
if (!cursor.moveToNext()) {
cursor.close();
return null;
}
final ArrayList<Author> list = new ArrayList<Author>();
do {
list.add(new Author(cursor.getString(0), cursor.getString(1)));
} while (cursor.moveToNext());
cursor.close();
return list;
}
protected List<Author> listAuthors(long bookId) {
final Cursor cursor = myDatabase.rawQuery("SELECT Authors.name,Authors.sort_key FROM BookAuthor INNER JOIN Authors ON Authors.author_id = BookAuthor.author_id WHERE BookAuthor.book_id = ?", new String[] { "" + bookId });
if (!cursor.moveToNext()) {
cursor.close();
@ -459,7 +473,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
return tag;
}
protected List<Tag> loadTags(long bookId) {
protected List<Tag> listTags(long bookId) {
final Cursor cursor = myDatabase.rawQuery("SELECT Tags.tag_id FROM BookTag INNER JOIN Tags ON Tags.tag_id = BookTag.tag_id WHERE BookTag.book_id = ?", new String[] { "" + bookId });
if (!cursor.moveToNext()) {
cursor.close();
@ -515,7 +529,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
}
}
protected SeriesInfo loadSeriesInfo(long bookId) {
protected SeriesInfo getSeriesInfo(long bookId) {
final Cursor cursor = myDatabase.rawQuery("SELECT Series.name,BookSeries.book_index FROM BookSeries INNER JOIN Series ON Series.series_id = BookSeries.series_id WHERE BookSeries.book_id = ?", new String[] { "" + bookId });
SeriesInfo info = null;
if (cursor.moveToNext()) {

12
src/org/geometerplus/fbreader/book/Book.java
View file

@ -153,9 +153,9 @@ public class Book {
public void reloadInfoFromDatabase() {
final BooksDatabase database = BooksDatabase.Instance();
database.reloadBook(this);
myAuthors = database.loadAuthors(myId);
myTags = database.loadTags(myId);
mySeriesInfo = database.loadSeriesInfo(myId);
myAuthors = database.listAuthors(myId);
myTags = database.listTags(myId);
mySeriesInfo = database.getSeriesInfo(myId);
myIsSaved = true;
}
@ -201,9 +201,9 @@ public class Book {
}
void loadLists(BooksDatabase database) {
myAuthors = database.loadAuthors(myId);
myTags = database.loadTags(myId);
mySeriesInfo = database.loadSeriesInfo(myId);
myAuthors = database.listAuthors(myId);
myTags = database.listTags(myId);
mySeriesInfo = database.getSeriesInfo(myId);
myIsSaved = true;
}

7
src/org/geometerplus/fbreader/book/BooksDatabase.java
View file

@ -62,9 +62,10 @@ public abstract class BooksDatabase {
public /*protected*/ abstract void reloadBook(Book book);
public /*protected*/ abstract Book loadBookByFile(long fileId, ZLFile file);
protected abstract List<Author> loadAuthors(long bookId);
protected abstract List<Tag> loadTags(long bookId);
protected abstract SeriesInfo loadSeriesInfo(long bookId);
protected abstract List<Author> listAuthors();
protected abstract List<Author> listAuthors(long bookId);
protected abstract List<Tag> listTags(long bookId);
protected abstract SeriesInfo getSeriesInfo(long bookId);
public /*protected*/ abstract void updateBookInfo(long bookId, long fileId, String encoding, String language, String title);
public /*protected*/ abstract long insertBookInfo(ZLFile file, String encoding, String language, String title);
protected abstract void deleteAllBookAuthors(long bookId);