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

Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

This commit is contained in:
renaud gaudin 2013-08-06 16:06:42 +08:00
parent c80914b774 9fb152b7f2
commit 2f7e909b88
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/kiwix/library.cpp
View File

@ -91,32 +91,33 @@ namespace kiwix {
/* Try to find it */ /* Try to find it */
std::vector<kiwix::Book>::iterator itr; std::vector<kiwix::Book>::iterator itr;
for ( itr = this->books.begin(); itr != this->books.end(); ++itr ) { for ( itr = this->books.begin(); itr != this->books.end(); ++itr ) {
if (itr->id == book.id && (itr->readOnly == book.readOnly || book.readOnly)) { if (itr->id == book.id) {
if (!itr->readOnly) {
itr->readOnly = book.readOnly;
itr->readOnly = book.readOnly; if (itr->path.empty())
itr->path = book.path;
if (itr->path.empty()) if (itr->pathAbsolute.empty())
itr->path = book.path; itr->pathAbsolute = book.pathAbsolute;
if (itr->pathAbsolute.empty()) if (itr->url.empty())
itr->pathAbsolute = book.pathAbsolute; itr->url = book.url;
if (itr->url.empty()) if (itr->indexPath.empty()) {
itr->url = book.url; itr->indexPath = book.indexPath;
itr->indexType = book.indexType;
}
if (itr->indexPath.empty()) { if (itr->indexPathAbsolute.empty()) {
itr->indexPath = book.indexPath; itr->indexPathAbsolute = book.indexPathAbsolute;
itr->indexType = book.indexType; itr->indexType = book.indexType;
} }
if (itr->indexPathAbsolute.empty()) { if (itr->faviconMimeType.empty()) {
itr->indexPathAbsolute = book.indexPathAbsolute; itr->favicon = book.favicon;
itr->indexType = book.indexType; itr->faviconMimeType = book.faviconMimeType;
} }
if (itr->faviconMimeType.empty()) {
itr->favicon = book.favicon;
itr->faviconMimeType = book.faviconMimeType;
} }
return false; return false;

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

@ -142,9 +142,6 @@ namespace kiwix {
if (!itr->path.empty()) if (!itr->path.empty())
bookNode.append_attribute("path") = itr->path.c_str(); bookNode.append_attribute("path") = itr->path.c_str();
if (!itr->pathAbsolute.empty())
bookNode.append_attribute("pathAbsolute") = itr->pathAbsolute.c_str();
if (!itr->last.empty() && itr->last != "undefined") { if (!itr->last.empty() && itr->last != "undefined") {
bookNode.append_attribute("last") = itr->last.c_str(); bookNode.append_attribute("last") = itr->last.c_str();
} }
@ -152,9 +149,6 @@ namespace kiwix {
if (!itr->indexPath.empty()) if (!itr->indexPath.empty())
bookNode.append_attribute("indexPath") = itr->indexPath.c_str(); bookNode.append_attribute("indexPath") = itr->indexPath.c_str();
if (!itr->indexPathAbsolute.empty())
bookNode.append_attribute("indexPathAbsolute") = itr->indexPathAbsolute.c_str();
if (!itr->indexPath.empty() || !itr->indexPathAbsolute.empty()) { if (!itr->indexPath.empty() || !itr->indexPathAbsolute.empty()) {
if (itr->indexType == XAPIAN) if (itr->indexType == XAPIAN)
bookNode.append_attribute("indexType") = "xapian"; bookNode.append_attribute("indexType") = "xapian";