From 50bee43617ab7cf02ae9f39683540d02d2a5acb3 Mon Sep 17 00:00:00 2001 From: hewenfei Date: Wed, 30 Mar 2022 14:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=B0=8D=E8=B1=A1=E7=9A=84=E9=82=8F=E8=BC=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchinterface/searchtasks/file-search-task.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libsearch/searchinterface/searchtasks/file-search-task.cpp b/libsearch/searchinterface/searchtasks/file-search-task.cpp index a332bb7..b91fd79 100644 --- a/libsearch/searchinterface/searchtasks/file-search-task.cpp +++ b/libsearch/searchinterface/searchtasks/file-search-task.cpp @@ -89,17 +89,17 @@ void FileSearchWorker::run() Xapian::Query FileSearchWorker::creatQueryForFileSearch() { Xapian::Query fileOrDir = Xapian::Query::MatchAll; - if (!m_searchController->isSearchDirOnly() || !m_searchController->isSearchFileOnly()) { + if (m_searchController->isSearchDirOnly() && m_searchController->isSearchFileOnly()) { + //同时指定'只搜索目录'和'只搜索文件',那麼拒絕搜索 + return {}; + + } else { if (m_searchController->isSearchDirOnly()) { fileOrDir = Xapian::Query(Xapian::Query::OP_VALUE_RANGE, 1, "1", "1"); } else if (m_searchController->isSearchFileOnly()) { fileOrDir = Xapian::Query(Xapian::Query::OP_VALUE_RANGE, 1, "0", "0"); } - - } else { - //同时指定只搜索目录和只搜索文件。。。 - return {}; } std::vector queries;