Fix Assistant crash with operational words.

Phrase queries with a single term are not allow in clucene,
so once we encounter a search string like "and Next", which
in turn will result in a single word, we use a term query.

Task-number: QTBUG-34973

Change-Id: I9328abf0e96428577cdee15b1671393074cc91c2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

diff --git a/src/assistant/help/qhelpsearchindexreader_clucene.cpp b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
index 4fb4817..bc0b726 100644 (file)
--- a/src/assistant/help/qhelpsearchindexreader_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
@@ -321,27 +321,25 @@ bool QHelpSearchIndexReaderClucene::addWithoutQuery(const QHelpSearchQuery &quer
 bool QHelpSearchIndexReaderClucene::addPhraseQuery(const QHelpSearchQuery &query,
     const QString &fieldName, QCLuceneBooleanQuery &booleanQuery)
 {
-    bool queryIsValid = false;
-    const QString &term = query.wordList.at(0).toLower();
-    if (term.contains(QLatin1Char(' '))) {
-        const QStringList termList = term.split(QLatin1String(" "));
-        QCLucenePhraseQuery *q = new QCLucenePhraseQuery();
-        const QStringList stopWords = QCLuceneStopAnalyzer().englishStopWords();
-        foreach (const QString &term, termList) {
-            if (!stopWords.contains(term, Qt::CaseInsensitive))
-                q->addTerm(QCLuceneTerm(fieldName, term.toLower()));
-        }
-        if (!q->getTerms().isEmpty()) {
-            booleanQuery.add(q, true, true, false);
-            queryIsValid = true;
-        }
-    } else {
-        QCLuceneQuery *lQuery = new QCLuceneTermQuery(QCLuceneTerm(
-                fieldName, term.toLower()));
-        booleanQuery.add(lQuery, true, true, false);
-        queryIsValid = true;
+    const QString phrase = query.wordList.at(0).toLower();
+    QStringList terms = phrase.split(QLatin1String(" "));
+    foreach (const QString &word, QCLuceneStopAnalyzer().englishStopWords())
+        terms.removeAll(word);
+
+    if (terms.isEmpty())
+        return false;
+
+    if (terms.count() == 1) {
+        QCLuceneQuery *term = new QCLuceneTermQuery(QCLuceneTerm(fieldName, terms[0].toLower()));
+        booleanQuery.add(term, true, true, false);
+        return true;
     }
-    return queryIsValid;
+
+    QCLucenePhraseQuery *phraseQuery = new QCLucenePhraseQuery();
+    foreach (const QString &term, terms)
+        phraseQuery->addTerm(QCLuceneTerm(fieldName, term.toLower()));
+    booleanQuery.add(phraseQuery, true, true, false);
+    return true;
 }
 
 bool QHelpSearchIndexReaderClucene::addAllQuery(const QHelpSearchQuery &query,