summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/fulltextindex.cpp7
-rw-r--r--tests/querytest.cpp3
2 files changed, 5 insertions, 5 deletions
diff --git a/common/fulltextindex.cpp b/common/fulltextindex.cpp
index 589feda..cc7fecf 100644
--- a/common/fulltextindex.cpp
+++ b/common/fulltextindex.cpp
@@ -166,13 +166,14 @@ QVector<QByteArray> FulltextIndex::lookup(const QString &searchTerm)
166 parser.set_database(*mDb); 166 parser.set_database(*mDb);
167 parser.set_max_expansion(100, Xapian::Query::WILDCARD_LIMIT_MOST_FREQUENT, Xapian::QueryParser::FLAG_PARTIAL); 167 parser.set_max_expansion(100, Xapian::Query::WILDCARD_LIMIT_MOST_FREQUENT, Xapian::QueryParser::FLAG_PARTIAL);
168 auto query = parser.parse_query(searchTerm.toStdString(), Xapian::QueryParser::FLAG_PHRASE|Xapian::QueryParser::FLAG_BOOLEAN|Xapian::QueryParser::FLAG_LOVEHATE|Xapian::QueryParser::FLAG_PARTIAL); 168 auto query = parser.parse_query(searchTerm.toStdString(), Xapian::QueryParser::FLAG_PHRASE|Xapian::QueryParser::FLAG_BOOLEAN|Xapian::QueryParser::FLAG_LOVEHATE|Xapian::QueryParser::FLAG_PARTIAL);
169 SinkTrace() << "Running xapian query: " << QString::fromStdString(query.get_description());
169 Xapian::Enquire enquire(*mDb); 170 Xapian::Enquire enquire(*mDb);
170 enquire.set_query(query); 171 enquire.set_query(query);
171 172
172 auto limit = 1000; 173 const auto limit = searchTerm.size() <= 4 ? 1000 : 10000;
173 Xapian::MSet mset = enquire.get_mset(0, limit); 174 Xapian::MSet mset = enquire.get_mset(0, limit);
174 Xapian::MSetIterator it = mset.begin(); 175 SinkTrace() << "Result set: " << QString::fromStdString(mset.get_description());
175 for (;it != mset.end(); it++) { 176 for (Xapian::MSetIterator it = mset.begin(); it != mset.end(); it++) {
176 auto doc = it.get_document(); 177 auto doc = it.get_document();
177 const auto data = doc.get_value(0); 178 const auto data = doc.get_value(0);
178 results << QByteArray{data.c_str(), int(data.length())}; 179 results << QByteArray{data.c_str(), int(data.length())};
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index ea3d8c6..8d60930 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -1520,12 +1520,11 @@ private slots:
1520 { 1520 {
1521 auto msg = KMime::Message::Ptr::create(); 1521 auto msg = KMime::Message::Ptr::create();
1522 msg->subject()->from7BitString("Subject To Search"); 1522 msg->subject()->from7BitString("Subject To Search");
1523 msg->setBody("This is the searchable body bar."); 1523 msg->setBody("This is the searchable body bar. unique sender2");
1524 msg->from()->from7BitString("\"The Sender\"<sender@example.org>"); 1524 msg->from()->from7BitString("\"The Sender\"<sender@example.org>");
1525 msg->to()->from7BitString("\"Foo Bar\"<foo-bar@example.org>"); 1525 msg->to()->from7BitString("\"Foo Bar\"<foo-bar@example.org>");
1526 msg->assemble(); 1526 msg->assemble();
1527 1527
1528 // Mail mail("sink.dummy.instance1");
1529 auto mail = ApplicationDomainType::createEntity<Mail>("sink.dummy.instance1"); 1528 auto mail = ApplicationDomainType::createEntity<Mail>("sink.dummy.instance1");
1530 mail.setExtractedMessageId("test1"); 1529 mail.setExtractedMessageId("test1");
1531 mail.setFolder("folder1"); 1530 mail.setFolder("folder1");