smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace std::vector<std::string> with SuggestionItem 

Each sugestions used to be stored as vector of strings to hold various values
such as title, path etc inside them. With this commit, we use the new
dedicated class `SuggestionItem` to do the same.
This commit is contained in:
Maneesh P M 2021-05-13 12:00:39 +05:30 committed by Matthieu Gautier
parent 5315034afe
commit 5567d8ca49
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/reader.h
View File

@ -77,7 +77,7 @@ class SuggestionItem
* file. * file.
*/ */
using SuggestionsList_t = std::vector<std::vector<std::string>>; using SuggestionsList_t = std::vector<SuggestionItem>;
class Reader class Reader
{ {
public: public:

24
src/reader.cpp
View File

@ -432,12 +432,12 @@ bool Reader::searchSuggestions(const string& prefix,
article is already in the suggestions list (with an other article is already in the suggestions list (with an other
title) */ title) */
bool insert = true; bool insert = true;
std::vector<std::vector<std::string>>::iterator suggestionItr; std::vector<SuggestionItem>::iterator suggestionItr;
for (suggestionItr = results.begin(); for (suggestionItr = results.begin();
suggestionItr != results.end(); suggestionItr != results.end();
suggestionItr++) { suggestionItr++) {
int result = normalizedArticleTitle.compare((*suggestionItr)[2]); int result = normalizedArticleTitle.compare((*suggestionItr).getNormalizedTitle());
if (result == 0 && articleFinalUrl.compare((*suggestionItr)[1]) == 0) { if (result == 0 && articleFinalUrl.compare((*suggestionItr).getPath()) == 0) {
insert = false; insert = false;
break; break;
} else if (result < 0) { } else if (result < 0) {
@ -447,10 +447,7 @@ bool Reader::searchSuggestions(const string& prefix,
/* Insert if possible */ /* Insert if possible */
if (insert) { if (insert) {
std::vector<std::string> suggestion; SuggestionItem suggestion(entry.getTitle(), normalizedArticleTitle, articleFinalUrl);
suggestion.push_back(entry.getTitle());
suggestion.push_back(articleFinalUrl);
suggestion.push_back(normalizedArticleTitle);
results.insert(suggestionItr, suggestion); results.insert(suggestionItr, suggestion);
} }
@ -506,11 +503,8 @@ bool Reader::searchSuggestionsSmart(const string& prefix,
for (auto current = suggestions.begin(); for (auto current = suggestions.begin();
current != suggestions.end(); current != suggestions.end();
current++) { current++) {
std::vector<std::string> suggestion; SuggestionItem suggestion(current.getTitle(), kiwix::normalize(current.getTitle()),
suggestion.push_back(current.getTitle()); current.getPath(), current.getSnippet());
suggestion.push_back(current.getPath());
suggestion.push_back(kiwix::normalize(current.getTitle()));
suggestion.push_back(current.getSnippet());
results.push_back(suggestion); results.push_back(suggestion);
} }
retVal = true; retVal = true;
@ -531,7 +525,7 @@ bool Reader::getNextSuggestion(string& title)
{ {
if (this->suggestionsOffset != this->suggestions.end()) { if (this->suggestionsOffset != this->suggestions.end()) {
/* title */ /* title */
title = (*(this->suggestionsOffset))[0]; title = (*(this->suggestionsOffset)).getTitle();
/* increment the cursor for the next call */ /* increment the cursor for the next call */
this->suggestionsOffset++; this->suggestionsOffset++;
@ -546,8 +540,8 @@ bool Reader::getNextSuggestion(string& title, string& url)
{ {
if (this->suggestionsOffset != this->suggestions.end()) { if (this->suggestionsOffset != this->suggestions.end()) {
/* title */ /* title */
title = (*(this->suggestionsOffset))[0]; title = (*(this->suggestionsOffset)).getTitle();
url = (*(this->suggestionsOffset))[1]; url = (*(this->suggestionsOffset)).getPath();
/* increment the cursor for the next call */ /* increment the cursor for the next call */
this->suggestionsOffset++; this->suggestionsOffset++;

10
src/server/internalServer.cpp
View File

@ -414,15 +414,15 @@ std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& r
reader->searchSuggestionsSmart(term, maxSuggestionCount, suggestions); reader->searchSuggestionsSmart(term, maxSuggestionCount, suggestions);
for(auto& suggestion:suggestions) { for(auto& suggestion:suggestions) {
MustacheData result; MustacheData result;
result.set("label", suggestion[0]); result.set("label", suggestion.getTitle());
if (!suggestion[3].empty()) { if (suggestion.hasSnippet()) {
result.set("label", suggestion[3]); result.set("label", suggestion.getSnippet());
} }
result.set("value", suggestion[0]); result.set("value", suggestion.getTitle());
result.set("kind", "path"); result.set("kind", "path");
result.set("path", suggestion[1]); result.set("path", suggestion.getPath());
result.set("first", first); result.set("first", first);
first = false; first = false;
results.push_back(result); results.push_back(result);