mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00
Code Issues Releases Wiki Activity

* Resolve correctly again. Need to work on performance.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-18 06:30:06 +02:00
parent 8b25ecc359
commit f4c05165dc
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp
View File

@@ -141,13 +141,13 @@ FuzzyIndex::appendFields( const Tomahawk::IndexData& data )
if ( !data.track.isEmpty() ) if ( !data.track.isEmpty() )
{ {
doc->add(newLucene<Field>( L"fulltext", Tomahawk::DatabaseImpl::sortname( QString( "%1 %2" ).arg( data.artist ).arg( data.track ) ).toStdWString(), doc->add(newLucene<Field>( L"fulltext", Tomahawk::DatabaseImpl::sortname( QString( "%1 %2" ).arg( data.artist ).arg( data.track ) ).toStdWString(),
Field::STORE_NO, Field::INDEX_ANALYZED ) ); Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) );
doc->add(newLucene<Field>( L"track", Tomahawk::DatabaseImpl::sortname( data.track ).toStdWString(), doc->add(newLucene<Field>( L"track", Tomahawk::DatabaseImpl::sortname( data.track ).toStdWString(),
Field::STORE_NO, Field::INDEX_ANALYZED ) ); Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) );
doc->add(newLucene<Field>( L"artist", Tomahawk::DatabaseImpl::sortname( data.artist ).toStdWString(), doc->add(newLucene<Field>( L"artist", Tomahawk::DatabaseImpl::sortname( data.artist ).toStdWString(),
Field::STORE_NO, Field::INDEX_ANALYZED ) ); Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) );
doc->add(newLucene<Field>( L"artistid", QString::number( data.artistId ).toStdWString(), doc->add(newLucene<Field>( L"artistid", QString::number( data.artistId ).toStdWString(),
Field::STORE_YES, Field::INDEX_NO ) ); Field::STORE_YES, Field::INDEX_NO ) );
@@ -158,7 +158,7 @@ FuzzyIndex::appendFields( const Tomahawk::IndexData& data )
else if ( !data.album.isEmpty() ) else if ( !data.album.isEmpty() )
{ {
doc->add(newLucene<Field>( L"album", Tomahawk::DatabaseImpl::sortname( data.album ).toStdWString(), doc->add(newLucene<Field>( L"album", Tomahawk::DatabaseImpl::sortname( data.album ).toStdWString(),
Field::STORE_NO, Field::INDEX_ANALYZED ) ); Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) );
doc->add(newLucene<Field>( L"albumid", QString::number( data.id ).toStdWString(), doc->add(newLucene<Field>( L"albumid", QString::number( data.id ).toStdWString(),
Field::STORE_YES, Field::INDEX_NO ) ); Field::STORE_YES, Field::INDEX_NO ) );
@@ -240,11 +240,11 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query )
FuzzyQueryPtr fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"track", q.toStdWString() ) ); FuzzyQueryPtr fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"track", q.toStdWString() ) );
qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::SHOULD ); qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::SHOULD );
fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"artist", q.toStdWString() ) ); FuzzyQueryPtr fqry2 = newLucene<FuzzyQuery>( newLucene<Term>( L"artist", q.toStdWString() ) );
qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::SHOULD ); qry->add( boost::dynamic_pointer_cast<Query>( fqry2 ), BooleanClause::SHOULD );
fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"fulltext", q.toStdWString() ) ); FuzzyQueryPtr fqry3 = newLucene<FuzzyQuery>( newLucene<Term>( L"fulltext", q.toStdWString() ) );
qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::SHOULD ); qry->add( boost::dynamic_pointer_cast<Query>( fqry3 ), BooleanClause::SHOULD );
minScore = 0.00; minScore = 0.00;
} }
@@ -257,8 +257,8 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query )
FuzzyQueryPtr fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"track", track.toStdWString() ) ); FuzzyQueryPtr fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"track", track.toStdWString() ) );
qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::MUST ); qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::MUST );
fqry = newLucene<FuzzyQuery>( newLucene<Term>( L"artist", artist.toStdWString() ) ); FuzzyQueryPtr fqry2 = newLucene<FuzzyQuery>( newLucene<Term>( L"artist", artist.toStdWString() ) );
qry->add( boost::dynamic_pointer_cast<Query>( fqry ), BooleanClause::MUST ); qry->add( boost::dynamic_pointer_cast<Query>( fqry2 ), BooleanClause::MUST );
minScore = 0.00; minScore = 0.00;
} }