diff --git a/HowToBuild b/HowToBuild new file mode 100644 index 000000000..3ac0b923a --- /dev/null +++ b/HowToBuild @@ -0,0 +1,10 @@ +How to Build for Android +------------------------ + +Requirements: Android SDK 1.6, Android NDK 1.5 + +1. Compile native code. + This step could be skipped, prebuilded native libraries are currently included into the source package. +2. Edit 'local.properties' file. +3. Run './createRawResources.py'. +4. Run 'ant release'. diff --git a/README b/README deleted file mode 100644 index d74564b61..000000000 --- a/README +++ /dev/null @@ -1,8 +0,0 @@ -How to Build for Android ------------------------- - -Requirements: Android SDK 1.6, Android NDK 1.5 - -1. compile native code in 'native' directory -2. edit 'local.properties' file -3. run 'ant release' diff --git a/packageTool.sh b/packageTool.sh index d214bb79f..582a537aa 100755 --- a/packageTool.sh +++ b/packageTool.sh @@ -25,7 +25,7 @@ buildSourceArchive() { ant clean rm -rf $dir $archive mkdir $dir - cp -r data icons src native build.xml res *.properties $0 VERSION $dir + cp -r data icons src native build.xml AndroidManifest.xml* res *.properties createRawResources.py libs HowToBuild $0 VERSION $dir rm -rf `find $dir -name .svn` zip -rq $archive $dir/* rm -rf $dir diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java index ff6f93453..6e3d466ee 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java @@ -37,7 +37,11 @@ class OEBMetaInfoReader extends ZLXMLReaderAdapter implements XMLNamespace { private String myAuthorTag; private String mySubjectTag; private String myLanguageTag; + private String myMetaTag = "meta"; + private String mySeriesTitle = ""; + private int mySeriesIndex = 0; + private final ArrayList myAuthorList = new ArrayList(); private final ArrayList myAuthorList2 = new ArrayList(); @@ -124,6 +128,16 @@ class OEBMetaInfoReader extends ZLXMLReaderAdapter implements XMLNamespace { myReadState = READ_SUBJECT; } else if (tag == myLanguageTag) { myReadState = READ_LANGUAGE; + } else if (tag == myMetaTag) { + if (attributes.getValue("name").equals("calibre:series")) { + mySeriesTitle = attributes.getValue("content"); + } else if (attributes.getValue("name").equals("calibre:series_index")) { + final String strIndex = attributes.getValue("content"); + try { + mySeriesIndex = Integer.parseInt(strIndex); + } catch (NumberFormatException e) { + } + } } } return false; @@ -178,6 +192,12 @@ class OEBMetaInfoReader extends ZLXMLReaderAdapter implements XMLNamespace { } break; } + } else { + if (tag == myMetaTag) { + if (!mySeriesTitle.equals("") && mySeriesIndex > 0) { + myBook.setSeriesInfo(mySeriesTitle, mySeriesIndex); + } + } } myBuffer.delete(0, myBuffer.length()); myReadState = READ_NONE;