yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Code Issues Releases Wiki Activity

uid reading for fb2/ePub files

Browse source
This commit is contained in:
Nikolay Pultsin 2013-03-23 22:09:44 +04:00
parent 4c5b4d51cd
commit dae0fe3f56
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
jni/NativeFormats/fbreader/src/formats/fb2/FB2UidReader.cpp
View file

@ -61,6 +61,7 @@ void FB2UidReader::endElementHandler(int tag) {
myBuffer.erase(); myBuffer.erase();
myReadState = READ_DOCUMENT_INFO; myReadState = READ_DOCUMENT_INFO;
} }
break;
default: default:
break; break;
} }

2
jni/NativeFormats/fbreader/src/formats/oeb/OEBUidReader.cpp
View file

@ -21,7 +21,6 @@
#include <ZLStringUtil.h> #include <ZLStringUtil.h>
#include <ZLUnicodeUtil.h> #include <ZLUnicodeUtil.h>
#include <ZLLogger.h>
#include <ZLXMLNamespace.h> #include <ZLXMLNamespace.h>
#include "OEBUidReader.h" #include "OEBUidReader.h"
@ -119,7 +118,6 @@ bool OEBUidReader::processNamespaces() const {
bool OEBUidReader::readUids(const ZLFile &file) { bool OEBUidReader::readUids(const ZLFile &file) {
myReadState = READ_NONE; myReadState = READ_NONE;
if (!readDocument(file)) { if (!readDocument(file)) {
ZLLogger::Instance().println("epub", "Failure while reading info from " + file.path());
return false; return false;
} }
return true; return true;

3
jni/NativeFormats/fbreader/src/library/Book.cpp
View file

@ -308,6 +308,9 @@ void Book::addUid(shared_ptr<UID> uid) {
} }
void Book::addUid(const std::string &type, const std::string &id) { void Book::addUid(const std::string &type, const std::string &id) {
if (type == "" || id == "") {
return;
}
addUid(new UID(type, id)); addUid(new UID(type, id));
} }

2
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -180,7 +180,7 @@ bool AndroidUtil::init(JavaVM* jvm) {
Method_Book_setEncoding = new VoidMethod(Class_Book, "setEncoding", "(Ljava/lang/String;)"); Method_Book_setEncoding = new VoidMethod(Class_Book, "setEncoding", "(Ljava/lang/String;)");
Method_Book_addAuthor = new VoidMethod(Class_Book, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)"); Method_Book_addAuthor = new VoidMethod(Class_Book, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)");
Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/book/Tag;)"); Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/book/Tag;)");
Method_Book_addTag = new VoidMethod(Class_Book, "addUid", "(Ljava/lang/String;Ljava/lang/String;)"); Method_Book_addUid = new VoidMethod(Class_Book, "addUid", "(Ljava/lang/String;Ljava/lang/String;)");
StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/book/Tag;Ljava/lang/String;)"); StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/book/Tag;Ljava/lang/String;)");

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

@ -84,7 +84,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
myDatabase.beginTransaction(); myDatabase.beginTransaction();
switch (myDatabase.getVersion()) { switch (version) {
case 0: case 0:
createTables(); createTables();
case 1: case 1: