kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-25 13:19:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ clucene fix for the new indexer

Browse Source
This commit is contained in:
kelson42 2012-04-07 19:31:11 +00:00
parent 31b3308937
commit e0a8b13ef1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/indexer/Makefile.am.orig
View File

@ -7,7 +7,8 @@ kiwix_index_SOURCES= \
../common/unaccent.cpp \ ../common/unaccent.cpp \
../common/kiwix/indexer.cpp \ ../common/kiwix/indexer.cpp \
../common/kiwix/reader.cpp \ ../common/kiwix/reader.cpp \
../common/kiwix/xapianIndexer.cpp ../common/kiwix/xapianIndexer.cpp \
../common/kiwix/cluceneIndexer.cpp \
include_HEADERS= \ include_HEADERS= \
../common/kiwix/xapian/myhtmlparse.h \ ../common/kiwix/xapian/myhtmlparse.h \
../common/kiwix/xapian/namedentities.h \ ../common/kiwix/xapian/namedentities.h \
@ -15,7 +16,8 @@ include_HEADERS= \
../common/unaccent.h \ ../common/unaccent.h \
../common/kiwix/indexer.h \ ../common/kiwix/indexer.h \
../common/kiwix/reader.h \ ../common/kiwix/reader.h \
../common/kiwix/xapianIndexer.h ../common/kiwix/xapianIndexer.h \
../common/kiwix/cluceneIndexer.h
kiwix_index_CXXFLAGS=$(LIBXAPIAN_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBICU_CFLAGS) $(LIBZIM_CFLAGS) -I../common/ kiwix_index_CXXFLAGS=$(LIBXAPIAN_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBICU_CFLAGS) $(LIBZIM_CFLAGS) -I../common/
kiwix_index_LDFLAGS=$(LIBXAPIAN_LDFLAGS) $(LIBCLUCENE_LDFLAGS) $(LIBICU_LDFLAGS) $(LIBZIM_LDFLAGS) kiwix_index_LDFLAGS=$(LIBXAPIAN_LDFLAGS) $(LIBCLUCENE_LDFLAGS) $(LIBICU_LDFLAGS) $(LIBZIM_LDFLAGS)
kiwix_index_LDADD=../zimlib/src/.libs/libzim.a kiwix_index_LDADD=../zimlib/src/.libs/libzim.a

6
src/installer/kiwix-install.cpp
View File

@ -170,10 +170,10 @@ int main(int argc, char **argv) {
try { try {
if (backend == CLUCENE) { if (backend == CLUCENE) {
#ifndef _WIN32 #ifndef _WIN32
indexer = new kiwix::CluceneIndexer(contentPath, indexPath); indexer = new kiwix::CluceneIndexer();
#endif #endif
} else { } else {
indexer = new kiwix::XapianIndexer(contentPath, indexPath); indexer = new kiwix::XapianIndexer();
} }
} catch (...) { } catch (...) {
cerr << "Unable to index '" << contentPath << "'." << endl; cerr << "Unable to index '" << contentPath << "'." << endl;
@ -181,7 +181,7 @@ int main(int argc, char **argv) {
} }
if (indexer != NULL) { if (indexer != NULL) {
indexer->start(); indexer->start(contentPath, indexPath);
while (indexer->isRunning()) { while (indexer->isRunning()) {
sleep(1); sleep(1);
} }