kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-24 04:20:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to new kiwix-lib search API.

Browse Source
This commit is contained in:
Matthieu Gautier 2017-05-28 23:11:02 +02:00
parent d94423964e
commit f12a731939
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/searcher/kiwix-search.cpp
View File

@ -80,12 +80,20 @@ int main(int argc, char **argv) {
/* Try to prepare the indexing */
try {
/* We will not get the snippets, So we do not need to pass the reader */
reader = new kiwix::Reader(zimPath);
searcher = new kiwix::Searcher(reader);
} catch (...) {
cerr << "Unable to search through zim '" << zimPath << "'." << endl;
exit(1);
/* Cannot open the zimPath, maybe it is a plain old xapian database directory */
}
if ( reader ) {
searcher = new kiwix::Searcher("", reader);
} else {
try {
searcher = new kiwix::Searcher(zimPath, NULL);
} catch (...) {
cerr << "Unable to search through zim '" << zimPath << "'." << endl;
exit(1);
}
}
/* Start the indexing */

2
src/server/kiwix-serve.cpp
View File

@ -856,7 +856,7 @@ int main(int argc, char **argv) {
if (!indexPath.empty()) {
try {
kiwix::Searcher *searcher = new kiwix::Searcher(reader);
kiwix::Searcher *searcher = new kiwix::Searcher(indexPath, reader);
searcher->setProtocolPrefix("/");
searcher->setSearchProtocolPrefix("/search?");
searcher->setContentHumanReadableId(humanReadableId);