From ef3202dc028aec620c1511b6fc48a6d45a4d58ae Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sun, 20 Mar 2011 18:47:14 +0000 Subject: [PATCH] + better search results --- src/common/kiwix/indexer.cpp | 11 ++++++----- src/common/kiwix/searcher.cpp | 6 +++++- src/common/kiwix/searcher.h | 1 + static/results.tmpl | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp index 4ae31d487..7442d17e2 100644 --- a/src/common/kiwix/indexer.cpp +++ b/src/common/kiwix/indexer.cpp @@ -127,16 +127,17 @@ namespace kiwix { } /* count words */ - stringstream st; - st << countWords(this->htmlParser.dump); - const std::string wordCountString = st.str(); + stringstream countWordStringStream; + countWordStringStream << countWords(this->htmlParser.dump); + const std::string wordCountString = countWordStringStream.str(); /* snippet */ const std::string snippet = std::string(this->htmlParser.dump, 0, 300); /* size */ - st << content.size(); - const std::string size = st.str(); + stringstream sizeStringStream; + sizeStringStream << content.size() / 1024; + const std::string size = sizeStringStream.str(); this->indexNextArticle(url, accentedTitle, diff --git a/src/common/kiwix/searcher.cpp b/src/common/kiwix/searcher.cpp index 6b0690118..4daed2915 100644 --- a/src/common/kiwix/searcher.cpp +++ b/src/common/kiwix/searcher.cpp @@ -24,7 +24,8 @@ namespace kiwix { /* Constructor */ Searcher::Searcher() : estimatedResultCount(0), - resultTemplatePath("") { + resultTemplatePath(""), + searchPattern("") { } /* Search strings in the database */ @@ -36,6 +37,7 @@ namespace kiwix { cout << "Performing query `" << search << "'" << endl; } + this->searchPattern = search; searchInIndex(removeAccents(search), resultsCount, verbose); this->resultOffset = this->results.begin(); @@ -47,6 +49,7 @@ namespace kiwix { this->results.clear(); this->resultOffset = this->results.begin(); this->estimatedResultCount = 0; + this->searchPattern = ""; return; } @@ -145,6 +148,7 @@ namespace kiwix { oData["results"] = resultsCDT; oData["count"] = this->estimatedResultCount; + oData["searchPattern"] = this->searchPattern; STLW::string sResult; StringOutputCollector oDataCollector(sResult); diff --git a/src/common/kiwix/searcher.h b/src/common/kiwix/searcher.h index 7c9192d46..a9b8e367d 100644 --- a/src/common/kiwix/searcher.h +++ b/src/common/kiwix/searcher.h @@ -77,6 +77,7 @@ namespace kiwix { std::vector::iterator resultOffset; std::string resultTemplatePath; unsigned int estimatedResultCount; + std::string searchPattern; }; } diff --git a/static/results.tmpl b/static/results.tmpl index 9239295ea..a60275a92 100644 --- a/static/results.tmpl +++ b/static/results.tmpl @@ -95,7 +95,7 @@
- Results 1-20 of for Paris + Results 1-20 of for