diff --git a/src/common/kiwix/library.cpp b/src/common/kiwix/library.cpp index 5f2557ff7..4ee7a45f9 100644 --- a/src/common/kiwix/library.cpp +++ b/src/common/kiwix/library.cpp @@ -92,10 +92,10 @@ namespace kiwix { std::vector::iterator itr; for ( itr = this->books.begin(); itr != this->books.end(); ++itr ) { if (itr->id == book.id) { - if (itr->readOnly == book.readOnly || book.readOnly) { + if (!itr->readOnly) { itr->readOnly = book.readOnly; - if (itr->path.empty()) + if (itr->path.empty()) itr->path = book.path; if (itr->pathAbsolute.empty()) @@ -118,9 +118,9 @@ namespace kiwix { itr->favicon = book.favicon; itr->faviconMimeType = book.faviconMimeType; } - - return false; } + + return false; } } diff --git a/src/common/kiwix/manager.cpp b/src/common/kiwix/manager.cpp index efb18c71b..abf2d2868 100644 --- a/src/common/kiwix/manager.cpp +++ b/src/common/kiwix/manager.cpp @@ -142,9 +142,6 @@ namespace kiwix { if (!itr->path.empty()) 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") { bookNode.append_attribute("last") = itr->last.c_str(); } @@ -152,9 +149,6 @@ namespace kiwix { if (!itr->indexPath.empty()) 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->indexType == XAPIAN) bookNode.append_attribute("indexType") = "xapian"; @@ -490,7 +484,7 @@ namespace kiwix { ok = false; if (ok == true && mode == REMOTE && (!itr->path.empty() || itr->url.empty())) - ok = false; + ok = false; if (ok == true && maxSize != 0 && (unsigned int)atoi(itr->size.c_str()) > maxSize * 1024 * 1024) ok = false;