smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ last imp.

This commit is contained in:
kelson42 2011-05-08 19:45:09 +00:00
parent de807c8e78
commit 49dd576a8a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/kiwix/manager.cpp
View File

@ -42,7 +42,8 @@ namespace kiwix {
book.readOnly = readOnly; book.readOnly = readOnly;
book.id = bookNode.attribute("id").value(); book.id = bookNode.attribute("id").value();
book.path = bookNode.attribute("path").value(); book.path = bookNode.attribute("path").value();
book.last = (std::string(bookNode.attribute("last").value()) != "undefined" ? bookNode.attribute("last").value() : ""); book.last = (std::string(bookNode.attribute("last").value()) != "undefined" ?
bookNode.attribute("last").value() : "");
book.indexPath = bookNode.attribute("indexPath").value(); book.indexPath = bookNode.attribute("indexPath").value();
book.indexType = (std::string(bookNode.attribute("indexType").value()) == "xapian" ? XAPIAN : CLUCENE); book.indexType = (std::string(bookNode.attribute("indexType").value()) == "xapian" ? XAPIAN : CLUCENE);
book.title = bookNode.attribute("title").value(); book.title = bookNode.attribute("title").value();
@ -57,10 +58,10 @@ namespace kiwix {
/* Update the book properties with the new importer */ /* Update the book properties with the new importer */
if (libraryVersion.empty() || atoi(libraryVersion.c_str()) < atoi(KIWIX_LIBRARY_VERSION)) { if (libraryVersion.empty() || atoi(libraryVersion.c_str()) < atoi(KIWIX_LIBRARY_VERSION)) {
if (!book.path.empty()) if (!book.path.empty()) {
ok = this->readBookFromPath(book.path, book); ok = this->readBookFromPath(book.path, book);
}
} }
if (ok) { if (ok) {
library.addBook(book); library.addBook(book);
@ -297,8 +298,9 @@ namespace kiwix {
} }
} else if (mode == REMOTE) { } else if (mode == REMOTE) {
for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) { for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) {
if (itr->path == "") if (itr->path == "") {
this->bookIdList.push_back(itr->id); this->bookIdList.push_back(itr->id);
}
} }
} else { } else {
for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) { for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) {