[search] Added the original query to the debug output of QueryParams.

search/processor.cpp

@@ -491,6 +491,8 @@ void Processor::SearchBookmarks() const
 
 void Processor::InitParams(QueryParams & params) const
 {
+  params.SetQuery(m_query);
+
   if (m_prefix.empty())
     params.InitNoPrefix(m_tokens.begin(), m_tokens.end());
   else

search/query_params.cpp

@@ -151,7 +151,9 @@ void QueryParams::AddSynonyms()
 string DebugPrint(QueryParams const & params)
 {
   ostringstream os;
-  os << "QueryParams [ m_tokens=" << ::DebugPrint(params.m_tokens)
+  os << "QueryParams [ "
+     << "m_query=\"" << params.m_query << "\""
+     << ", m_tokens=" << ::DebugPrint(params.m_tokens)
      << ", m_prefixToken=" << DebugPrint(params.m_prefixToken)
      << ", m_typeIndices=" << ::DebugPrint(params.m_typeIndices)
      << ", m_langs=" << DebugPrint(params.m_langs) << " ]";

search/query_params.hpp

@@ -86,6 +86,8 @@ public:
 
   QueryParams() = default;
 
+  void SetQuery(std::string const & query) { m_query = query; }
+
   template <typename It>
   void InitNoPrefix(It tokenBegin, It tokenEnd)
   {
@@ -142,6 +144,9 @@ private:
 
   void AddSynonyms();
 
+  // The original query without any normalizations.
+  std::string m_query;
+
   std::vector<Token> m_tokens;
   Token m_prefixToken;
   bool m_hasPrefix = false;