mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 08:04:25 +02:00
Code Issues Releases Wiki Activity

* Search / Store lucene strings after calling sortname() on them.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-16 15:53:47 +01:00
parent 5b2ff1ba07
commit 2139068737
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/database/fuzzyindex.cpp
View File

@@ -99,7 +99,7 @@ FuzzyIndex::appendFields( const QString& table, const QMap< unsigned int, QStrin
QString name = it.value(); QString name = it.value();
{ {
Field* field = _CLNEW Field( table.toStdWString().c_str(), name.toStdWString().c_str(), Field* field = _CLNEW Field( table.toStdWString().c_str(), DatabaseImpl::sortname( name ).toStdWString().c_str(),
Field::STORE_YES | Field::INDEX_UNTOKENIZED ); Field::STORE_YES | Field::INDEX_UNTOKENIZED );
doc.add( *field ); doc.add( *field );
} }
@@ -158,7 +158,7 @@ FuzzyIndex::search( const QString& table, const QString& name )
QueryParser parser( table.toStdWString().c_str(), m_analyzer ); QueryParser parser( table.toStdWString().c_str(), m_analyzer );
Hits* hits = 0; Hits* hits = 0;
FuzzyQuery* qry = _CLNEW FuzzyQuery( _CLNEW Term( table.toStdWString().c_str(), name.toStdWString().c_str() ) ); FuzzyQuery* qry = _CLNEW FuzzyQuery( _CLNEW Term( table.toStdWString().c_str(), DatabaseImpl::sortname( name ).toStdWString().c_str() ) );
hits = m_luceneSearcher->search( qry ); hits = m_luceneSearcher->search( qry );
for ( int i = 0; i < hits->length(); i++ ) for ( int i = 0; i < hits->length(); i++ )
@@ -169,7 +169,7 @@ FuzzyIndex::search( const QString& table, const QString& name )
int id = QString::fromWCharArray( d->get( _T( "id" ) ) ).toInt(); int id = QString::fromWCharArray( d->get( _T( "id" ) ) ).toInt();
QString result = QString::fromWCharArray( d->get( table.toStdWString().c_str() ) ); QString result = QString::fromWCharArray( d->get( table.toStdWString().c_str() ) );
if ( result.toLower() == name.toLower() ) if ( DatabaseImpl::sortname( result ) == DatabaseImpl::sortname( name ) )
score = 1.0; score = 1.0;
else else
score = qMin( score, (float)0.99 ); score = qMin( score, (float)0.99 );