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

DSL: Change of tags handling while full-text search

Browse source
This commit is contained in:
Abs62 2019-09-18 18:32:40 +03:00
parent c53fe1c640
commit 780eabac47
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dsl.cc
View file

@ -91,7 +91,7 @@ enum
Signature = 0x584c5344, // DSLX on little-endian, XLSD on big-endian Signature = 0x584c5344, // DSLX on little-endian, XLSD on big-endian
CurrentFormatVersion = 22 + BtreeIndexing::FormatVersion + Folding::Version, CurrentFormatVersion = 22 + BtreeIndexing::FormatVersion + Folding::Version,
CurrentZipSupportVersion = 2, CurrentZipSupportVersion = 2,
CurrentFtsIndexVersion = 5 CurrentFtsIndexVersion = 6
}; };
struct IdxHeader struct IdxHeader
@ -1518,7 +1518,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
if( tag.compare( stripTags[ n ], Qt::CaseInsensitive ) == 0 ) if( tag.compare( stripTags[ n ], Qt::CaseInsensitive ) == 0 )
{ {
pos2 = text.indexOf( stripEndTags[ n ] , pos + stripTags[ n ].size() + 2, Qt::CaseInsensitive ); pos2 = text.indexOf( stripEndTags[ n ] , pos + stripTags[ n ].size() + 2, Qt::CaseInsensitive );
text.remove( pos, pos2 > 0 ? pos2 - pos + stripEndTags[ n ].length() : text.length() - pos ); text.replace( pos, pos2 > 0 ? pos2 - pos + stripEndTags[ n ].length() : text.length() - pos, " " );
break; break;
} }
} }
@ -1531,9 +1531,13 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
// Strip tags // Strip tags
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
text.replace( QRegularExpression( "\\[(|/)(p|trn|ex|com|\\*|t|br|m[0-9]?)\\]" ), " " );
text.replace( QRegularExpression( "\\[(|/)lang(\\s[^\\]]*)?\\]" ), " " );
text.remove( QRegularExpression( "\\[[^\\\\\\[\\]]+\\]" ) ); text.remove( QRegularExpression( "\\[[^\\\\\\[\\]]+\\]" ) );
#else #else
text.remove( QRegExp( "\\[[^\\\\\\[\\]]+\\]", Qt::CaseInsensitive ) ); text.replace( QRegExp( "\\[(|/)(p|trn|ex|com|\\*|t|br|m[0-9]?)\\]" ), " " );
text.replace( QRegExp( "\\[(|/)lang(\\s[^\\]]*)?\\]" ), " " );
text.remove( QRegExp( "\\[[^\\\\\\[\\]]+\\]" ) );
#endif #endif
// Chech for insided cards // Chech for insided cards