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

Fixed handling of backslashes in suggestions

This commit is contained in:
Veloman Yunkan 2022-11-10 17:23:10 +04:00
parent c727de6591
commit 4966f4155d
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/otherTools.cpp
View File

@ -333,6 +333,19 @@ std::string kiwix::render_template(const std::string& template_str, kainjow::mus
namespace namespace
{ {
std::string escapeBackslashes(const std::string& s)
{
std::string es;
es.reserve(s.size());
for (char c : s) {
if ( c == '\\' ) {
es.push_back('\\');
}
es.push_back(c);
}
return es;
}
std::string makeFulltextSearchSuggestion(const std::string& lang, std::string makeFulltextSearchSuggestion(const std::string& lang,
const std::string& queryString) const std::string& queryString)
{ {
@ -358,10 +371,10 @@ void kiwix::Suggestions::add(const zim::SuggestionItem& suggestion)
? suggestion.getSnippet() ? suggestion.getSnippet()
: suggestion.getTitle(); : suggestion.getTitle();
result.set("label", label); result.set("label", escapeBackslashes(label));
result.set("value", suggestion.getTitle()); result.set("value", escapeBackslashes(suggestion.getTitle()));
result.set("kind", "path"); result.set("kind", "path");
result.set("path", suggestion.getPath()); result.set("path", escapeBackslashes(suggestion.getPath()));
result.set("first", m_data.is_empty_list()); result.set("first", m_data.is_empty_list());
m_data.push_back(result); m_data.push_back(result);
} }
@ -370,8 +383,9 @@ void kiwix::Suggestions::addFTSearchSuggestion(const std::string& uiLang,
const std::string& queryString) const std::string& queryString)
{ {
kainjow::mustache::data result; kainjow::mustache::data result;
result.set("label", makeFulltextSearchSuggestion(uiLang, queryString)); const std::string label = makeFulltextSearchSuggestion(uiLang, queryString);
result.set("value", queryString + " "); result.set("label", escapeBackslashes(label));
result.set("value", escapeBackslashes(queryString + " "));
result.set("kind", "pattern"); result.set("kind", "pattern");
result.set("first", m_data.is_empty_list()); result.set("first", m_data.is_empty_list());
m_data.push_back(result); m_data.push_back(result);