From 474c4e9a7a7c0848bdce46e40177555fa5dbc3fd Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sat, 23 Jan 2010 14:11:52 +0000 Subject: [PATCH] + introduction of the search engine --- src/server/kiwix-serve.cpp | 119 ++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 35 deletions(-) diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index 8b0f3a1..415d1f3 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -16,6 +16,7 @@ #include #include #include +#include using namespace std; @@ -33,6 +34,8 @@ static const string HTMLScripts = " \ margin-right: 5px; \n \ padding: 5px; \n \ font-weight: bold; \n \ + font-size: 14px; \n \ + height: min; \n \ background: #FFFFFF; \n \ visibility: hidden; \n \ z-index: 100; \n \ @@ -99,13 +102,14 @@ else if (document.getElementById) \n \ "; static const string HTMLDiv = " \ -
\n \ -Search \n \ -
\n \ +
Search
\n \ "; static kiwix::Reader* reader; -static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +static kiwix::Searcher* searcher; +static pthread_mutex_t readerLock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t searcherLock = PTHREAD_MUTEX_INITIALIZER; +static bool hasSearchIndex = false; static void appendToFirstOccurence(string &content, const string regex, const string &replacement) { regmatch_t matchs[1]; @@ -140,34 +144,62 @@ static int accessHandlerCallback(void *cls, return MHD_YES; } - /* Prepare the variable */ + /* Prepare the variables */ struct MHD_Response *response; string content = ""; string mimeType = ""; unsigned int contentLength = 0; - /* Mutex lock */ - pthread_mutex_lock(&lock); + if (!strcmp(url, "/search")) { + const char* pattern = MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "pattern"); + std::string urlStr; + std::string titleStr; + unsigned int scoreInt; + char scoreStr[4]; + + /* Mutex lock */ + pthread_mutex_lock(&searcherLock); + + searcher->search(pattern, 30); + content = "Kiwix search results

Results

    \n"; + while (searcher->getNextResult(urlStr, titleStr, scoreInt)) { + sprintf(scoreStr, "%d", scoreInt); + content += "
  1. " + titleStr+ " (" + scoreStr + "%)
    2. \n"; - /* Load the article from the ZIM file */ - cout << "Loading '" << url << "'... " << endl; - try { - reader->getContent(url, content, contentLength, mimeType); - cout << "content size: " << contentLength << endl; - cout << "mimeType: " << mimeType << endl; - - /* Rewrite the content */ - if (mimeType == "text/html") { - appendToFirstOccurence(content, "", HTMLScripts); - appendToFirstOccurence(content, "]*>", HTMLDiv); - contentLength = content.size(); } - } catch (const std::exception& e) { - std::cerr << e.what() << std::endl; + content += "
\n"; + + mimeType ="text/html"; + contentLength = content.size(); + + /* Mutex unlock */ + pthread_mutex_unlock(&searcherLock); + + } else { + + /* Mutex Lock */ + pthread_mutex_lock(&readerLock); + + /* Load the article from the ZIM file */ + cout << "Loading '" << url << "'... " << endl; + try { + reader->getContent(url, content, contentLength, mimeType); + cout << "content size: " << contentLength << endl; + cout << "mimeType: " << mimeType << endl; + } catch (const std::exception& e) { + std::cerr << e.what() << std::endl; + } + + /* Mutex unlock */ + pthread_mutex_unlock(&readerLock); } - /* Mutex unlock */ - pthread_mutex_unlock(&lock); + /* Rewrite the content (add the search box) */ + if (mimeType == "text/html") { + appendToFirstOccurence(content, "", HTMLScripts); + appendToFirstOccurence(content, "]*>", HTMLDiv); + contentLength = content.size(); + } /* clear context pointer */ *ptr = NULL; @@ -201,8 +233,35 @@ int main(int argc, char **argv) { string zimPath = (argv[1]); int port = atoi(argv[2]); + string indexPath = (argc>3 ? argv[3] : ""); + void *page; + /* Instanciate the ZIM file handler */ + try { + reader = new kiwix::Reader(zimPath); + } catch (...) { + cout << "Unable to open the ZIM file '" << zimPath << "'." << endl; + exit(1); + } + + /* Instanciate the ZIM index (if necessary) */ + if (indexPath != "") { + try { + searcher = new kiwix::Searcher(indexPath); + hasSearchIndex = true; + } catch (...) { + cout << "Unable to open the search index '" << zimPath << "'." << endl; + exit(1); + } + } else { + hasSearchIndex = false; + } + + /* Mutex init */ + pthread_mutex_init(&readerLock, NULL); + pthread_mutex_init(&searcherLock, NULL); + /* Start the HTTP daemon */ daemon = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION, port, @@ -217,17 +276,6 @@ int main(int argc, char **argv) { exit(1); } - /* Instanciate the ZIM file handler */ - try { - reader = new kiwix::Reader(zimPath); - } catch (...) { - cout << "Unable to open the ZIM file '" << zimPath << "'." << endl; - exit(1); - } - - /* Mutex init */ - pthread_mutex_init(&lock, NULL); - /* Run endless */ while (42) sleep(1); @@ -235,7 +283,8 @@ int main(int argc, char **argv) { MHD_stop_daemon(daemon); /* Mutex destroy */ - pthread_mutex_destroy(&lock); + pthread_mutex_destroy(&readerLock); + pthread_mutex_destroy(&searcherLock); exit(0); }