From f4c05165dcb7f514469411656649807cd305d299 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 18 Sep 2014 06:30:06 +0200 Subject: [PATCH] * Resolve correctly again. Need to work on performance. --- .../database/fuzzyindex/FuzzyIndex.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp index 0c8355fbb..cc7d5b429 100644 --- a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp +++ b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp @@ -141,13 +141,13 @@ FuzzyIndex::appendFields( const Tomahawk::IndexData& data ) if ( !data.track.isEmpty() ) { doc->add(newLucene( 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( L"track", Tomahawk::DatabaseImpl::sortname( data.track ).toStdWString(), - Field::STORE_NO, Field::INDEX_ANALYZED ) ); + Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) ); doc->add(newLucene( L"artist", Tomahawk::DatabaseImpl::sortname( data.artist ).toStdWString(), - Field::STORE_NO, Field::INDEX_ANALYZED ) ); + Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) ); doc->add(newLucene( L"artistid", QString::number( data.artistId ).toStdWString(), Field::STORE_YES, Field::INDEX_NO ) ); @@ -158,7 +158,7 @@ FuzzyIndex::appendFields( const Tomahawk::IndexData& data ) else if ( !data.album.isEmpty() ) { doc->add(newLucene( L"album", Tomahawk::DatabaseImpl::sortname( data.album ).toStdWString(), - Field::STORE_NO, Field::INDEX_ANALYZED ) ); + Field::STORE_NO, Field::INDEX_NOT_ANALYZED ) ); doc->add(newLucene( L"albumid", QString::number( data.id ).toStdWString(), Field::STORE_YES, Field::INDEX_NO ) ); @@ -240,11 +240,11 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query ) FuzzyQueryPtr fqry = newLucene( newLucene( L"track", q.toStdWString() ) ); qry->add( boost::dynamic_pointer_cast( fqry ), BooleanClause::SHOULD ); - fqry = newLucene( newLucene( L"artist", q.toStdWString() ) ); - qry->add( boost::dynamic_pointer_cast( fqry ), BooleanClause::SHOULD ); + FuzzyQueryPtr fqry2 = newLucene( newLucene( L"artist", q.toStdWString() ) ); + qry->add( boost::dynamic_pointer_cast( fqry2 ), BooleanClause::SHOULD ); - fqry = newLucene( newLucene( L"fulltext", q.toStdWString() ) ); - qry->add( boost::dynamic_pointer_cast( fqry ), BooleanClause::SHOULD ); + FuzzyQueryPtr fqry3 = newLucene( newLucene( L"fulltext", q.toStdWString() ) ); + qry->add( boost::dynamic_pointer_cast( fqry3 ), BooleanClause::SHOULD ); minScore = 0.00; } @@ -257,8 +257,8 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query ) FuzzyQueryPtr fqry = newLucene( newLucene( L"track", track.toStdWString() ) ); qry->add( boost::dynamic_pointer_cast( fqry ), BooleanClause::MUST ); - fqry = newLucene( newLucene( L"artist", artist.toStdWString() ) ); - qry->add( boost::dynamic_pointer_cast( fqry ), BooleanClause::MUST ); + FuzzyQueryPtr fqry2 = newLucene( newLucene( L"artist", artist.toStdWString() ) ); + qry->add( boost::dynamic_pointer_cast( fqry2 ), BooleanClause::MUST ); minScore = 0.00; }