synchronization with library-service branch

build.xml

@@ -46,8 +46,8 @@
 					<srcfiles dir="jni/LineBreak" includes="**/*.cpp,**/*.c,**/*.h"/>
 				</uptodate>
 				<!-- Check if libNativeFormats exists and is up to date -->
-				<available file="./libs/armeabi/libNativeFormats-v2.so" />
+				<available file="./libs/armeabi/libNativeFormats-v3.so" />
-				<uptodate property="libNativeFormats-build-is-not-required" targetfile="libs/armeabi/libNativeFormats-v2.so">
+				<uptodate property="libNativeFormats-build-is-not-required" targetfile="libs/armeabi/libNativeFormats-v3.so">
 					<srcfiles dir="jni/NativeFormats" includes="**/*.cpp,**/*.c,**/*.h"/>
 				</uptodate>
 			</and>

src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java

@@ -519,7 +519,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
 		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()) {
-			info = new SeriesInfo(cursor.getString(0), SeriesInfo.createIndex(cursor.getString(1)));
+			info = SeriesInfo.createSeriesInfo(cursor.getString(0), cursor.getString(1));
 		}
 		cursor.close();
 		return info;

src/org/geometerplus/fbreader/book/SerializerUtil.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2007-2013 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.fbreader.book;
+
+import java.util.*;
+
+import org.geometerplus.fbreader.library.Book;
+import org.geometerplus.fbreader.library.Bookmark;
+
+public abstract class SerializerUtil {
+	private SerializerUtil() {
+	}
+
+	private static final AbstractSerializer defaultSerializer = new XMLSerializer();
+
+	public static String serialize(Book book) {
+		return book != null ? defaultSerializer.serialize(book) : null;
+	}
+
+	public static Book deserializeBook(String xml) {
+		return xml != null ? defaultSerializer.deserializeBook(xml) : null;
+	}
+
+	public static String serialize(Bookmark bookmark) {
+		return bookmark != null ? defaultSerializer.serialize(bookmark) : null;
+	}
+
+	public static Bookmark deserializeBookmark(String xml) {
+		return xml != null ? defaultSerializer.deserializeBookmark(xml) : null;
+	}
+
+	public static List<String> serializeBookList(List<Book> books) {
+		final List<String> serialized = new ArrayList<String>(books.size());
+		for (Book b : books) {
+			serialized.add(defaultSerializer.serialize(b));
+		}
+		return serialized;
+	}
+
+	public static List<Book> deserializeBookList(List<String> xmlList) {
+		final List<Book> books = new ArrayList<Book>(xmlList.size());
+		for (String xml : xmlList) {
+			books.add(defaultSerializer.deserializeBook(xml));
+		}
+		return books;
+	}
+
+	public static List<String> serializeBookmarkList(List<Bookmark> bookmarks) {
+		final List<String> serialized = new ArrayList<String>(bookmarks.size());
+		for (Bookmark b : bookmarks) {
+			serialized.add(defaultSerializer.serialize(b));
+		}
+		return serialized;
+	}
+
+	public static List<Bookmark> deserializeBookmarkList(List<String> xmlList) {
+		final List<Bookmark> bookmarks = new ArrayList<Bookmark>(xmlList.size());
+		for (String xml : xmlList) {
+			bookmarks.add(defaultSerializer.deserializeBookmark(xml));
+		}
+		return bookmarks;
+	}
+}

src/org/geometerplus/fbreader/book/SeriesInfo.java

@@ -22,6 +22,13 @@ package org.geometerplus.fbreader.book;
 import java.math.BigDecimal;
 
 public final class SeriesInfo {
+	public static SeriesInfo createSeriesInfo(String title, String index) {
+		if (title == null) {
+			return null;
+		}
+		return new SeriesInfo(title, createIndex(index));
+	}
+
 	public static BigDecimal createIndex(String index) {
 		try {
 			return index != null ? new BigDecimal(index).stripTrailingZeros() : null;

src/org/geometerplus/fbreader/book/XMLSerializer.java

@@ -0,0 +1,526 @@
+/*
+ * Copyright (C) 2007-2013 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.fbreader.book;
+
+import java.util.*;
+import java.text.DateFormat;
+import java.text.ParseException;
+
+import org.geometerplus.zlibrary.core.constants.XMLNamespaces;
+import org.geometerplus.zlibrary.core.filesystem.ZLFile;
+import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
+import org.geometerplus.zlibrary.core.xml.ZLStringMap;
+
+import org.geometerplus.fbreader.library.Book;
+import org.geometerplus.fbreader.library.Bookmark;
+
+class XMLSerializer extends AbstractSerializer {
+	@Override
+	public String serialize(Book book) {
+		final StringBuilder buffer = new StringBuilder();
+		appendTag(
+			buffer, "entry", false,
+			"xmlns:dc", XMLNamespaces.DublinCore,
+			"xmlns:calibre", XMLNamespaces.CalibreMetadata
+		);
+
+		appendTagWithContent(buffer, "id", book.getId());
+		appendTagWithContent(buffer, "title", book.getTitle());
+		appendTagWithContent(buffer, "dc:language", book.getLanguage());
+		appendTagWithContent(buffer, "dc:encoding", book.getEncodingNoDetection());
+
+		for (Author author : book.authors()) {
+			appendTag(buffer, "author", false);
+			appendTagWithContent(buffer, "uri", author.SortKey);
+			appendTagWithContent(buffer, "name", author.DisplayName);
+			closeTag(buffer, "author");
+		}
+
+		for (Tag tag : book.tags()) {
+			appendTag(
+				buffer, "category", true,
+				"term", tag.toString("/"),
+				"label", tag.Name
+			);
+		}
+
+		final SeriesInfo seriesInfo = book.getSeriesInfo();
+		if (seriesInfo != null) {
+			appendTagWithContent(buffer, "calibre:series", seriesInfo.Title);
+			if (seriesInfo.Index != null) {
+				appendTagWithContent(buffer, "calibre:series_index", seriesInfo.Index);
+			}
+		}
+		// TODO: serialize description (?)
+		// TODO: serialize cover (?)
+
+		appendTag(
+			buffer, "link", true,
+			"href", book.File.getUrl(),
+			// TODO: real book mimetype
+			"type", "application/epub+zip",
+			"rel", "http://opds-spec.org/acquisition"
+		);
+
+		closeTag(buffer, "entry");
+		return buffer.toString();
+	}
+
+	@Override
+	public Book deserializeBook(String xml) {
+		final BookDeserializer deserializer = new BookDeserializer();
+		deserializer.readQuietly(xml);
+		return deserializer.getBook();
+	}
+
+	@Override
+	public String serialize(Bookmark bookmark) {
+		final StringBuilder buffer = new StringBuilder();
+		appendTag(
+			buffer, "bookmark", false,
+			"id", String.valueOf(bookmark.getId()),
+			"visible", String.valueOf(bookmark.IsVisible)
+		);
+		appendTag(
+			buffer, "book", true,
+			"id", String.valueOf(bookmark.getBookId()),
+			"title", bookmark.getBookTitle()
+		);
+		appendTagWithContent(buffer, "text", bookmark.getText());
+		appendTag(
+			buffer, "history", true,
+			"date-creation", formatDate(bookmark.getDate(Bookmark.DateType.Creation)),
+			"date-modification", formatDate(bookmark.getDate(Bookmark.DateType.Modification)),
+			"date-access", formatDate(bookmark.getDate(Bookmark.DateType.Access)),
+			"access-count", String.valueOf(bookmark.getAccessCount())
+		);
+		appendTag(
+			buffer, "position", true,
+			"model", bookmark.ModelId,
+			"paragraph", String.valueOf(bookmark.getParagraphIndex()),
+			"element", String.valueOf(bookmark.getElementIndex()),
+			"char", String.valueOf(bookmark.getCharIndex())
+		);
+		closeTag(buffer, "bookmark");
+		return buffer.toString();
+	}
+
+	@Override
+	public Bookmark deserializeBookmark(String xml) {
+		final BookmarkDeserializer deserializer = new BookmarkDeserializer();
+		deserializer.readQuietly(xml);
+		return deserializer.getBookmark();
+	}
+
+	private static DateFormat ourDateFormatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.FULL, Locale.ENGLISH);
+	private static String formatDate(Date date) {
+		return date != null ? ourDateFormatter.format(date) : null;
+	}
+	private static Date parseDate(String str) throws ParseException {
+		return str != null ? ourDateFormatter.parse(str) : null;
+	}
+
+	private static void appendTag(StringBuilder buffer, String tag, boolean close, String ... attrs) {
+		buffer.append('<').append(tag);
+		for (int i = 0; i < attrs.length - 1; i += 2) {
+			if (attrs[i + 1] != null) {
+				buffer.append(' ')
+					.append(escapeForXml(attrs[i])).append("=\"")
+					.append(escapeForXml(attrs[i + 1])).append('"');
+			}
+		}
+		if (close) {
+			buffer.append('/');
+		}
+		buffer.append(">\n");
+	}
+
+	private static void closeTag(StringBuilder buffer, String tag) {
+		buffer.append("</").append(tag).append(">");
+	}
+
+	private static void appendTagWithContent(StringBuilder buffer, String tag, String content) {
+		if (content != null) {
+			buffer
+				.append('<').append(tag).append('>')
+				.append(escapeForXml(content))
+				.append("</").append(tag).append(">\n");
+		}
+	}
+
+	private static void appendTagWithContent(StringBuilder buffer, String tag, Object content) {
+		if (content != null) {
+			appendTagWithContent(buffer, tag, String.valueOf(content));
+		}
+	}
+
+	private static String escapeForXml(String data) {
+		if (data.indexOf('&') != -1) {
+			data = data.replaceAll("&", "&amp;");
+		}
+		if (data.indexOf('<') != -1) {
+			data = data.replaceAll("&", "&lt;");
+		}
+		if (data.indexOf('>') != -1) {
+			data = data.replaceAll("&", "&gt;");
+		}
+		if (data.indexOf('\'') != -1) {
+			data = data.replaceAll("&", "&apos;");
+		}
+		if (data.indexOf('"') != -1) {
+			data = data.replaceAll("&", "&quot;");
+		}
+		return data;
+	}
+
+	private static void clear(StringBuilder buffer) {
+		buffer.delete(0, buffer.length());
+	}
+
+	private static String string(StringBuilder buffer) {
+		return buffer.length() != 0 ? buffer.toString() : null;
+	}
+
+	private static final class BookDeserializer extends ZLXMLReaderAdapter {
+		private static enum State {
+			READ_NOTHING,
+			READ_ENTRY,
+			READ_ID,
+			READ_TITLE,
+			READ_LANGUAGE,
+			READ_ENCODING,
+			READ_AUTHOR,
+			READ_AUTHOR_URI,
+			READ_AUTHOR_NAME,
+			READ_SERIES_TITLE,
+			READ_SERIES_INDEX,
+		}
+
+		private State myState = State.READ_NOTHING;
+		
+		private long myId = -1;
+		private String myUrl;
+		private final StringBuilder myTitle = new StringBuilder();
+		private final StringBuilder myLanguage = new StringBuilder();
+		private final StringBuilder myEncoding = new StringBuilder();
+		private final ArrayList<Author> myAuthors = new ArrayList<Author>();
+		private final ArrayList<Tag> myTags = new ArrayList<Tag>();
+		private final StringBuilder myAuthorSortKey = new StringBuilder();
+		private final StringBuilder myAuthorName = new StringBuilder();
+		private final StringBuilder mySeriesTitle = new StringBuilder();
+		private final StringBuilder mySeriesIndex = new StringBuilder();
+
+		private Book myBook;
+
+		public Book getBook() {
+			return myState == State.READ_NOTHING ? myBook : null;
+		}
+
+		@Override
+		public void startDocumentHandler() {
+			myBook = null;
+
+			myId = -1;
+			myUrl = null;
+			clear(myTitle);
+			clear(myLanguage);
+			clear(myEncoding);
+			clear(mySeriesTitle);
+			clear(mySeriesIndex);
+			myAuthors.clear();
+			myTags.clear();
+
+			myState = State.READ_NOTHING;
+		}
+
+		@Override
+		public void endDocumentHandler() {
+			if (myId == -1) {
+				return;
+			}
+			myBook = new Book(
+				myId,
+				ZLFile.createFileByUrl(myUrl),
+				string(myTitle),
+				string(myEncoding),
+				string(myLanguage)
+			);
+			for (Author author : myAuthors) {
+				myBook.addAuthorWithNoCheck(author);
+			}
+			for (Tag tag : myTags) {
+				myBook.addTagWithNoCheck(tag);
+			}
+			myBook.setSeriesInfoWithNoCheck(string(mySeriesTitle), string(mySeriesIndex));
+		}
+
+		@Override
+		public boolean startElementHandler(String tag, ZLStringMap attributes) {
+			switch (myState) {
+				case READ_NOTHING:
+					if (!"entry".equals(tag)) {
+						return true;
+					}
+					myState = State.READ_ENTRY;
+					break;
+				case READ_ENTRY:
+					if ("id".equals(tag)) {
+						myState = State.READ_ID;
+					} else if ("title".equals(tag)) {
+						myState = State.READ_TITLE;
+					} else if ("dc:language".equals(tag)) {
+						myState = State.READ_LANGUAGE;
+					} else if ("dc:encoding".equals(tag)) {
+						myState = State.READ_ENCODING;
+					} else if ("author".equals(tag)) {
+						myState = State.READ_AUTHOR;
+						clear(myAuthorName);
+						clear(myAuthorSortKey);
+					} else if ("category".equals(tag)) {
+						final String term = attributes.getValue("term");
+						if (term != null) {
+							myTags.add(Tag.getTag(term.split("/")));
+						}
+					} else if ("calibre:series".equals(tag)) {
+						myState = State.READ_SERIES_TITLE;
+					} else if ("calibre:series_index".equals(tag)) {
+						myState = State.READ_SERIES_INDEX;
+					} else if ("link".equals(tag)) {
+						// TODO: use "rel" attribute
+						myUrl = attributes.getValue("href");
+					} else {
+						return true;
+					}
+					break;
+				case READ_AUTHOR:
+					if ("uri".equals(tag)) {
+						myState = State.READ_AUTHOR_URI;
+					} else if ("name".equals(tag)) {
+						myState = State.READ_AUTHOR_NAME;
+					} else {
+						return true;
+					}
+					break;
+			}
+			return false;
+		}
+		
+		@Override
+		public boolean endElementHandler(String tag) {
+			switch (myState) {
+				case READ_NOTHING:
+					return true;
+				case READ_ENTRY:
+					if ("entry".equals(tag)) {
+						myState = State.READ_NOTHING;
+					}	
+					break;
+				case READ_AUTHOR_URI:
+				case READ_AUTHOR_NAME:
+					myState = State.READ_AUTHOR;
+					break;
+				case READ_AUTHOR:
+					if (myAuthorSortKey.length() > 0 && myAuthorName.length() > 0) {
+						myAuthors.add(
+							new Author(myAuthorName.toString(), myAuthorSortKey.toString())
+						);
+					}
+					myState = State.READ_ENTRY;
+					break;
+				default:
+					myState = State.READ_ENTRY;
+					break;
+			}
+			return false;
+		}
+		
+		@Override
+		public void characterDataHandler(char[] ch, int start, int length) {
+			switch (myState) {
+				case READ_ID:
+					try {
+						myId = Long.parseLong(new String(ch, start, length));
+					} catch (NumberFormatException e) {
+					}
+					break;
+				case READ_TITLE:
+					myTitle.append(ch, start, length);
+					break;
+				case READ_LANGUAGE:
+					myLanguage.append(ch, start, length);
+					break;
+				case READ_ENCODING:
+					myEncoding.append(ch, start, length);
+					break;
+				case READ_AUTHOR_URI:
+					myAuthorSortKey.append(ch, start, length);
+					break;
+				case READ_AUTHOR_NAME:
+					myAuthorName.append(ch, start, length);
+					break;
+				case READ_SERIES_TITLE:
+					mySeriesTitle.append(ch, start, length);
+					break;
+				case READ_SERIES_INDEX:
+					mySeriesIndex.append(ch, start, length);
+					break;
+			}
+		}
+	}
+
+	private static final class BookmarkDeserializer extends ZLXMLReaderAdapter {
+		private static enum State {
+			READ_NOTHING,
+			READ_BOOKMARK,
+			READ_TEXT
+		}
+
+		private State myState = State.READ_NOTHING;
+		private Bookmark myBookmark;
+		
+		private long myId = -1;
+		private long myBookId;
+		private String myBookTitle;
+		private final StringBuilder myText = new StringBuilder();
+		private Date myCreationDate;
+		private Date myModificationDate;
+		private Date myAccessDate;
+		private int myAccessCount;
+		private String myModelId;
+		private int myParagraphIndex;
+		private int myElementIndex;
+		private int myCharIndex;
+		private boolean myIsVisible;
+
+		public Bookmark getBookmark() {
+			return myState == State.READ_NOTHING ? myBookmark : null;
+		}
+
+		@Override
+		public void startDocumentHandler() {
+			myBookmark = null;
+
+			myId = -1;
+			myBookId = -1;
+			myBookTitle = null;
+			clear(myText);
+			myCreationDate = null;
+			myModificationDate = null;
+			myAccessDate = null;
+			myAccessCount = 0;
+			myModelId = null;
+			myParagraphIndex = 0;
+			myElementIndex = 0;
+			myCharIndex = 0;
+			myIsVisible = false;
+
+			myState = State.READ_NOTHING;
+		}
+
+		@Override
+		public void endDocumentHandler() {
+			if (myBookId == -1) {
+				return;
+			}
+			myBookmark = new Bookmark(
+				myId, myBookId, myBookTitle, myText.toString(),
+				myCreationDate, myModificationDate, myAccessDate, myAccessCount,
+				myModelId, myParagraphIndex, myElementIndex, myCharIndex, myIsVisible
+			);
+		}
+
+		//appendTagWithContent(buffer, "text", bookmark.getText());
+		@Override
+		public boolean startElementHandler(String tag, ZLStringMap attributes) {
+			switch (myState) {
+				case READ_NOTHING:
+					if (!"bookmark".equals(tag)) {
+						return true;
+					}
+					try {
+						myId = Long.parseLong(attributes.getValue("id"));
+						myIsVisible = Boolean.parseBoolean(attributes.getValue("visible"));
+						myState = State.READ_BOOKMARK;
+					} catch (Exception e) {
+						return true;
+					}
+					break;
+				case READ_BOOKMARK:
+					if ("book".equals(tag)) {
+						try {
+							myBookId = Long.parseLong(attributes.getValue("id"));
+							myBookTitle = attributes.getValue("title");
+						} catch (Exception e) {
+							return true;
+						}
+					} else if ("text".equals(tag)) {
+						myState = State.READ_TEXT;
+					} else if ("history".equals(tag)) {
+						try {
+							myCreationDate = parseDate(attributes.getValue("date-creation"));
+							myModificationDate = parseDate(attributes.getValue("date-modification"));
+							myAccessDate = parseDate(attributes.getValue("date-access"));
+							myAccessCount = Integer.parseInt(attributes.getValue("access-count"));
+						} catch (Exception e) {
+							return true;
+						}
+					} else if ("position".equals(tag)) {
+						try {
+							myModelId = attributes.getValue("model");
+							myParagraphIndex = Integer.parseInt(attributes.getValue("paragraph"));
+							myElementIndex = Integer.parseInt(attributes.getValue("element"));
+							myCharIndex = Integer.parseInt(attributes.getValue("char"));
+						} catch (Exception e) {
+							return true;
+						}
+					} else {
+						return true;
+					}
+					break;
+				case READ_TEXT:
+					return true;
+			}
+			return false;
+		}
+		
+		@Override
+		public boolean endElementHandler(String tag) {
+			switch (myState) {
+				case READ_NOTHING:
+					return true;
+				case READ_BOOKMARK:
+					if ("bookmark".equals(tag)) {
+						myState = State.READ_NOTHING;
+					}	
+					break;
+				case READ_TEXT:
+					myState = State.READ_BOOKMARK;
+			}
+			return false;
+		}
+		
+		@Override
+		public void characterDataHandler(char[] ch, int start, int length) {
+			if (myState == State.READ_TEXT) {
+				myText.append(ch, start, length);
+			}
+		}
+	}
+}

src/org/geometerplus/fbreader/library/Book.java

@@ -121,7 +121,7 @@ public class Book {
 	private static final WeakReference<ZLImage> NULL_IMAGE = new WeakReference<ZLImage>(null);
 	private WeakReference<ZLImage> myCover;
 
-	Book(long id, ZLFile file, String title, String encoding, String language) {
+	public Book(long id, ZLFile file, String title, String encoding, String language) {
 		myId = id;
 		File = file;
 		myTitle = title;
@@ -208,7 +208,7 @@ public class Book {
 		return (myAuthors != null) ? Collections.unmodifiableList(myAuthors) : Collections.<Author>emptyList();
 	}
 
-	void addAuthorWithNoCheck(Author author) {
+	public void addAuthorWithNoCheck(Author author) {
 		if (myAuthors == null) {
 			myAuthors = new ArrayList<Author>();
 		}
@@ -284,8 +284,8 @@ public class Book {
 		return mySeriesInfo;
 	}
 
-	void setSeriesInfoWithNoCheck(String name, BigDecimal index) {
+	public void setSeriesInfoWithNoCheck(String name, String index) {
-		mySeriesInfo = new SeriesInfo(name, index);
+		mySeriesInfo = SeriesInfo.createSeriesInfo(name, index);
 	}
 
 	public void setSeriesInfo(String name, String index) {
@@ -346,7 +346,7 @@ public class Book {
 		return myTags != null ? Collections.unmodifiableList(myTags) : Collections.<Tag>emptyList();
 	}
 
-	void addTagWithNoCheck(Tag tag) {
+	public void addTagWithNoCheck(Tag tag) {
 		if (myTags == null) {
 			myTags = new ArrayList<Tag>();
 		}

src/org/geometerplus/fbreader/library/Bookmark.java

@@ -46,7 +46,7 @@ public final class Bookmark extends ZLTextFixedPosition {
 
 	private boolean myIsChanged;
 
-	Bookmark(long id, long bookId, String bookTitle, String text, Date creationDate, Date modificationDate, Date accessDate, int accessCount, String modelId, int paragraphIndex, int elementIndex, int charIndex, boolean isVisible) {
+	public Bookmark(long id, long bookId, String bookTitle, String text, Date creationDate, Date modificationDate, Date accessDate, int accessCount, String modelId, int paragraphIndex, int elementIndex, int charIndex, boolean isVisible) {
 		super(paragraphIndex, elementIndex, charIndex);
 
 		myId = id;

src/org/geometerplus/fbreader/library/BooksDatabase.java

@@ -52,7 +52,7 @@ public abstract class BooksDatabase {
 		book.addTagWithNoCheck(tag);
 	}
 	protected void setSeriesInfo(Book book, String series, String index) {
-		book.setSeriesInfoWithNoCheck(series, SeriesInfo.createIndex(index));
+		book.setSeriesInfoWithNoCheck(series, index);
 	}
 
 	protected abstract void executeAsATransaction(Runnable actions);