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

Full-text search: Fix case of inside cards in DSL

Browse source
This commit is contained in:
Abs62 2014-04-17 20:38:41 +04:00
parent fd1d035c01
commit 4572b2bc77
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
dsl.cc
View file

@ -1186,6 +1186,9 @@ void DslDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text ) void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
{ {
headword.clear();
text.clear();
vector< char > chunk; vector< char > chunk;
char * articleProps; char * articleProps;
@ -1240,7 +1243,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
// Skip headword // Skip headword
size_t pos = 0; size_t pos = 0;
wstring tildeValue; wstring articleHeadword;
for( ; ; ) for( ; ; )
{ {
@ -1248,20 +1251,20 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
pos = articleData.find_first_of( GD_NATIVE_TO_WS( L"\n\r" ), begin ); pos = articleData.find_first_of( GD_NATIVE_TO_WS( L"\n\r" ), begin );
if ( tildeValue.empty() ) if ( articleHeadword.empty() )
{ {
// Process the headword // Process the headword
tildeValue = wstring( articleData, begin, pos - begin ); articleHeadword = wstring( articleData, begin, pos - begin );
list< wstring > lst; list< wstring > lst;
expandOptionalParts( tildeValue, &lst ); expandOptionalParts( articleHeadword, &lst );
if ( lst.size() ) // Should always be if ( lst.size() ) // Should always be
tildeValue = lst.front(); articleHeadword = lst.front();
processUnsortedParts( tildeValue, false ); processUnsortedParts( articleHeadword, true );
} }
if ( pos == articleData.size() ) if ( pos == articleData.size() )
@ -1285,8 +1288,38 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
} }
} }
unescapeDsl( tildeValue ); if( !articleHeadword.empty() && isDslWs( articleHeadword[ 0 ] ) )
headword = gd::toQString( tildeValue ); {
// Headword of the insided card
// Take it from card if no '~' presented
string::size_type pos = articleHeadword.find( L'@' );
if( pos != string::npos )
{
wstring head = Folding::trimWhitespace( articleHeadword.substr( pos + 1 ) );
string::size_type tildaPos = head.find( L'~' );
while( tildaPos != string::npos )
{
if( tildaPos == 0 || head[ tildaPos ] != L'\\' )
break;
tildaPos = head.find( L'~', tildaPos + 1 );
}
if( tildaPos == string::npos )
{
// This is full headword - store it
unescapeDsl( head );
headword = gd::toQString( head );
}
// If '~' presented, leave headword empty,
// it will be retrieved from index later
}
}
else
{
unescapeDsl( articleHeadword );
headword = gd::toQString( articleHeadword );
}
wstring articleText; wstring articleText;