Changeset 561 for trunk/tools/assistant/lib/qhelpsearchengine.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/assistant/lib/qhelpsearchengine.cpp (modified) (14 diffs)

trunk/tools/assistant/lib/qhelpsearchengine.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include "qhelpsearchresultwidget.h"
 
+
 #if defined(QT_CLUCENE_SUPPORT)
 #   include "qhelpsearchindexreader_clucene_p.h"
@@ -85 +86 @@
         , helpEngine(helpEngine)
     {
-        hitList.clear();
         indexReader = 0;
         indexWriter = 0;
@@ -92 +92 @@
     ~QHelpSearchEnginePrivate()
     {
-        hitList.clear();
         delete indexReader;
         delete indexWriter;
     }
 
-    int hitsCount() const
+    int hitCount() const
     {
         int count = 0;
         if (indexReader)
-            count = indexReader->hitsCount();
+            count = indexReader->hitCount();
 
         return count;
@@ -108 +107 @@
     QList<QHelpSearchEngine::SearchHit> hits(int start, int end) const
     {
-        QList<QHelpSearchEngine::SearchHit> returnValue;
-        if (indexReader) {
-            for (int i = start; i < end && i < hitsCount(); ++i)
-                returnValue.append(indexReader->hit(i));
-        }
-        return returnValue;
+        return indexReader ?
+                indexReader->hits(start, end) :
+                QList<QHelpSearchEngine::SearchHit>();
     }
 
@@ -132 +128 @@
         }
 
-        if (indexWriter) {
-            indexWriter->cancelIndexing();
-            indexWriter->updateIndex(helpEngine->collectionFile(),
-                indexFilesFolder(), reindex);
-        }
+        indexWriter->cancelIndexing();
+        indexWriter->updateIndex(helpEngine->collectionFile(),
+                                 indexFilesFolder(), reindex);
     }
 
@@ -154 +148 @@
 
         if (!indexReader) {
-            indexReader = new QHelpSearchIndexReader();
-
+#if defined(QT_CLUCENE_SUPPORT)
+            indexReader = new QHelpSearchIndexReaderClucene();
+#else
+            indexReader = new QHelpSearchIndexReaderDefault();
+#endif // QT_CLUCENE_SUPPORT
             connect(indexReader, SIGNAL(searchingStarted()), this, SIGNAL(searchingStarted()));
             connect(indexReader, SIGNAL(searchingFinished(int)), this, SIGNAL(searchingFinished(int)));
         }
 
-        if (indexReader) {
-            m_queryList = queryList;
-            indexReader->cancelSearching();
-            indexReader->search(helpEngine->collectionFile(), indexFilesFolder(), queryList);
-        }
+        m_queryList = queryList;
+        indexReader->cancelSearching();
+        indexReader->search(helpEngine->collectionFile(), indexFilesFolder(), queryList);
     }
 
@@ -190 +185 @@
 #if defined(QT_CLUCENE_SUPPORT)
         if (indexWriter && !helpEngine.isNull()) {
-            indexWriter->optimizeIndex();            
+            indexWriter->optimizeIndex();
         }
 #endif
@@ -201 +196 @@
     QHelpSearchResultWidget *resultWidget;
 
-    QHelpSearchIndexReader *indexReader;
+    QHelpSearchIndexReader *indexReader;
     QHelpSearchIndexWriter *indexWriter;
 
     QPointer<QHelpEngineCore> helpEngine;
-    QList<QHelpSearchEngine::SearchHit> hitList;
 
     QList<QHelpSearchQuery> m_queryList;
@@ -244 +238 @@
 
     \value DEFAULT  the default field provided by the search widget, several terms should be
-                    splitted and stored in the wordlist except search terms enclosed in quotes.
+                    splitlist except search terms enclosed in quotes.
     \value FUZZY    a field only provided in use with clucene. Terms should be split in seperate
                     words and passed to the search engine.
@@ -331 +325 @@
 {
     d = new QHelpSearchEnginePrivate(helpEngine);
-    
+
     connect(helpEngine, SIGNAL(setupFinished()), this, SLOT(indexDocumentation()));
 
@@ -372 +366 @@
 
 /*!
+
     Returns the amount of hits the search engine found.
+
 */
 int QHelpSearchEngine::hitsCount() const
 {
-    return d->hitsCount();
+    return d->hitCount();
+}
+
+/*!
+    \since 4.6
+    Returns the amount of hits the search engine found.
+*/
+int QHelpSearchEngine::hitCount() const
+{
+    return d->hitCount();
 }