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

Fixed extern compile (static) on linux and removed Clucene dependency

This commit is contained in:
rgaudin 2013-12-09 10:51:06 +00:00
parent 8bb7c040b1
commit fcf84811c6
2 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kiwix/library.h
View File

@ -36,7 +36,7 @@ using namespace std;
namespace kiwix { namespace kiwix {
enum supportedIndexType { UNKNOWN, XAPIAN, CLUCENE }; enum supportedIndexType { UNKNOWN, XAPIAN };
class Book { class Book {

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

@ -48,7 +48,7 @@ namespace kiwix {
book.last = (std::string(bookNode.attribute("last").value()) != "undefined" ? book.last = (std::string(bookNode.attribute("last").value()) != "undefined" ?
bookNode.attribute("last").value() : ""); 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 = XAPIAN;
book.title = bookNode.attribute("title").value(); book.title = bookNode.attribute("title").value();
book.description = bookNode.attribute("description").value(); book.description = bookNode.attribute("description").value();
book.language = bookNode.attribute("language").value(); book.language = bookNode.attribute("language").value();
@ -152,8 +152,6 @@ namespace kiwix {
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";
else if (itr->indexType == CLUCENE)
bookNode.append_attribute("indexType") = "clucene";
} }
if (!itr->title.empty()) if (!itr->title.empty())