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

+ fix regression recently introduces (segfault if no search index)

Browse Source
This commit is contained in:
kelson42 2011-04-19 06:19:05 +00:00
parent 9414d7f1ec
commit 0ae076b5ad
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,15 +416,6 @@ int main(int argc, char **argv) {
/* Instanciate the ZIM index (if necessary) */ /* Instanciate the ZIM index (if necessary) */
if (indexPath != "") { if (indexPath != "") {
/* Try with the XapianSearcher */
try {
searcher = new kiwix::XapianSearcher(indexPath);
hasSearchIndex = true;
} catch (...) {
cerr << "Unable to open the search index '" << zimPath << "' with the XapianSearcher." << endl;
}
/* Change the current dir to binary dir */ /* Change the current dir to binary dir */
/* Non portable linux solution */ /* Non portable linux solution */
readlink("/proc/self/exe", rootPath, PATH_MAX); readlink("/proc/self/exe", rootPath, PATH_MAX);
@ -453,6 +444,14 @@ int main(int argc, char **argv) {
exit(1); exit(1);
} }
/* Try with the XapianSearcher */
try {
searcher = new kiwix::XapianSearcher(indexPath);
hasSearchIndex = true;
} catch (...) {
cerr << "Unable to open the search index '" << zimPath << "' with the XapianSearcher." << endl;
}
/* Try with the CluceneSearcher */ /* Try with the CluceneSearcher */
if (!hasSearchIndex) { if (!hasSearchIndex) {
try { try {
@ -464,14 +463,14 @@ int main(int argc, char **argv) {
} }
} }
} else {
hasSearchIndex = false;
}
/* searcher configuration */ /* searcher configuration */
searcher->setProtocolPrefix("/"); searcher->setProtocolPrefix("/");
searcher->setSearchProtocolPrefix("/search?"); searcher->setSearchProtocolPrefix("/search?");
} else {
hasSearchIndex = false;
}
/* Fork if necessary */ /* Fork if necessary */
if (daemonFlag) { if (daemonFlag) {
pid_t pid; pid_t pid;