hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 16:54:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-06-05 08:33:19 +08:00
parent fec256da4e ee2fc14311
commit da85ee97c7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ftshelpers.cc
View file

@ -644,7 +644,7 @@ void FTSResultsRequest::checkArticles( QVector< uint32_t > const & offsets,
void FTSResultsRequest::indexSearch( BtreeIndexing::BtreeIndex & ftsIndex, void FTSResultsRequest::indexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
sptr< ChunkedStorage::Reader > chunks, sptr< ChunkedStorage::Reader > chunks,
QStringList & indexWords, QStringList & indexWords,
QStringList & searchWords ) QStringList & searchWords, QRegExp & regexp )
{ {
// Find articles which contains all requested words // Find articles which contains all requested words
@ -714,7 +714,7 @@ void FTSResultsRequest::indexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
dict.sortArticlesOffsetsForFTS( offsets, isCancelled ); dict.sortArticlesOffsetsForFTS( offsets, isCancelled );
checkArticles( offsets, searchWords ); checkArticles( offsets, searchWords, regexp );
} }
void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex, void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
@ -1048,7 +1048,7 @@ void FTSResultsRequest::run()
else else
{ {
if( searchMode == FTS::WholeWords ) if( searchMode == FTS::WholeWords )
indexSearch( ftsIndex, chunks, indexWords, searchWords ); indexSearch( ftsIndex, chunks, indexWords, searchWords, searchRegExp );
else else
fullIndexSearch( ftsIndex, chunks, indexWords, searchWords, searchRegExp ); fullIndexSearch( ftsIndex, chunks, indexWords, searchWords, searchRegExp );
} }

2
ftshelpers.hh
View file

@ -91,7 +91,7 @@ class FTSResultsRequest : public Dictionary::DataRequest
void indexSearch( BtreeIndexing::BtreeIndex & ftsIndex, void indexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
sptr< ChunkedStorage::Reader > chunks, sptr< ChunkedStorage::Reader > chunks,
QStringList & indexWords, QStringList & indexWords,
QStringList & searchWords ); QStringList & searchWords, QRegExp & regexp );
void combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex, void combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsIndex,
sptr< ChunkedStorage::Reader > chunks, sptr< ChunkedStorage::Reader > chunks,