From a6d98d5085dd72f5070dddfbc1221d254b0f1bc1 Mon Sep 17 00:00:00 2001
From: iaom <18504285112@163.com>
Date: Fri, 28 May 2021 14:22:17 +0800
Subject: [PATCH] Some optimization.

---
 libsearch/index/search-manager.cpp | 31 +++++++++---------------------
 libsearch/libsearch.pro            |  2 +-
 src/create-index-ask-dialog.h      |  1 +
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/libsearch/index/search-manager.cpp b/libsearch/index/search-manager.cpp
index ce75385..fa28e8a 100644
--- a/libsearch/index/search-manager.cpp
+++ b/libsearch/index/search-manager.cpp
@@ -27,7 +27,7 @@ QMutex  SearchManager::m_mutex1;
 QMutex  SearchManager::m_mutex2;
 QMutex  SearchManager::m_mutex3;
 SearchManager::SearchManager(QObject *parent) : QObject(parent) {
-    m_pool.setMaxThreadCount(2);
+    m_pool.setMaxThreadCount(3);
     m_pool.setExpiryTimeout(1000);
 }
 
@@ -280,29 +280,16 @@ int FileContentSearch::keywordSearchContent() {
             words.append(sKeyWord.at(i).word).append(" ");
         }
 
-        Xapian::Query query = qp.parse_query(words);
-//        Xapian::Query query = qp.parse_query(keyword.toStdString());
-
-
-
-//        QVector<SKeyWord> sKeyWord = ChineseSegmentation::getInstance()->callSegement(keyword);
-//        //Creat a query
-//        std::string words;
-//        for(int i=0;i<sKeyWord.size();i++)
-//        {
-//            words.append(sKeyWord.at(i).word).append(" ");
-//        }
-
-
 //        Xapian::Query query = qp.parse_query(words);
 
-        //        std::vector<Xapian::Query> v;
-        //        for(int i=0;i<sKeyWord.size();i++)
-        //        {
-        //            v.push_back(Xapian::Query(sKeyWord.at(i).word));
-        //            qDebug()<<QString::fromStdString(sKeyWord.at(i).word);
-        //        }
-        //        Xapian::Query queryPhrase =Xapian::Query(Xapian::Query::OP_AND, v.begin(), v.end());
+        std::vector<Xapian::Query> v;
+        for(int i=0;i<sKeyWord.size();i++)
+        {
+            v.push_back(Xapian::Query(sKeyWord.at(i).word));
+            qDebug()<<QString::fromStdString(sKeyWord.at(i).word);
+        }
+        Xapian::Query query =Xapian::Query(Xapian::Query::OP_AND, v.begin(), v.end());
+
         qDebug() << "keywordSearchContent:" << QString::fromStdString(query.get_description());
 
         enquire.set_query(query);
diff --git a/libsearch/libsearch.pro b/libsearch/libsearch.pro
index 4b85b0d..8ffed23 100644
--- a/libsearch/libsearch.pro
+++ b/libsearch/libsearch.pro
@@ -67,7 +67,7 @@ unix {
     INSTALLS += target
 
     header.path = /usr/include/ukui-search
-    header.files += *.h index/*.h appsearch/*.h settingsearch/*.h
+    header.files += *.h index/*.h appsearch/*.h settingsearch/*.h plugininterface/*.h
     INSTALLS += header
 }
 
diff --git a/src/create-index-ask-dialog.h b/src/create-index-ask-dialog.h
index 4719181..b1eb974 100644
--- a/src/create-index-ask-dialog.h
+++ b/src/create-index-ask-dialog.h
@@ -32,6 +32,7 @@
 #include <QStyleOption>
 #include <QApplication>
 #include <QPainter>
+#include <QPainterPath>
 
 namespace Zeeker {
 class CreateIndexAskDialog : public QDialog {