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

+ Sort prefix matches by their lengths, the smaller the better.

Browse source
This commit is contained in:
Konstantin Isakov 2009-04-09 22:09:38 +00:00
parent 32b7e9f9c8
commit e41ad3126b
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/wordfinder.cc
View file

@ -159,6 +159,12 @@ void WordFinder::requestFinished()
namespace {
unsigned saturated( unsigned x )
{
return x < 255 ? x : 255;
}
/// Checks whether the first string has the second one inside, surrounded from
/// both sides by either whitespace, punctuation or begin/end of string.
/// If true is returned, pos holds the offset in the haystack. If the offset
@ -182,8 +188,7 @@ bool hasSurroundedWithWs( wstring const & haystack, wstring const & needle,
Folding::isWhitespace( haystack[ pos + needle.size() ] ) ||
Folding::isPunct( haystack[ pos + needle.size() ] ) ) )
{
if ( pos > 255 )
pos = 255;
pos = saturated( pos );
return true;
}
@ -298,16 +303,16 @@ void WordFinder::updateResults()
i->second->rank = ExactNoPunctInsideMatch * Multiplier + matchPos;
else
if ( i->first.size() > target.size() && i->first.compare( 0, target.size(), target ) == 0 )
i->second->rank = PrefixMatch * Multiplier;
i->second->rank = PrefixMatch * Multiplier + saturated( i->first.size() );
else
if ( resultNoDia.size() > targetNoDia.size() && resultNoDia.compare( 0, targetNoDia.size(), targetNoDia ) == 0 )
i->second->rank = PrefixNoDiaMatch * Multiplier;
i->second->rank = PrefixNoDiaMatch * Multiplier + saturated( i->first.size() );
else
if ( resultNoPunct.size() > targetNoPunct.size() && resultNoPunct.compare( 0, targetNoPunct.size(), targetNoPunct ) == 0 )
i->second->rank = PrefixNoPunctMatch * Multiplier;
i->second->rank = PrefixNoPunctMatch * Multiplier + saturated( i->first.size() );
else
if ( resultNoWs.size() > targetNoWs.size() && resultNoWs.compare( 0, targetNoWs.size(), targetNoWs ) == 0 )
i->second->rank = PrefixNoWsMatch * Multiplier;
i->second->rank = PrefixNoWsMatch * Multiplier + saturated( i->first.size() );
else
i->second->rank = WorstMatch * Multiplier;
}