mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

minScore check in FuzzyIndex isn't used anymore.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-14 13:12:49 +02:00
parent 62115ccccc
commit 0362f54724
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query )
try try
{ {
float minScore; // float minScore = 0.00;
Collection<String> fields; // = newCollection<String>(); Collection<String> fields; // = newCollection<String>();
MultiFieldQueryParserPtr parser = newLucene<MultiFieldQueryParser>( LuceneVersion::LUCENE_CURRENT, fields, m_analyzer ); MultiFieldQueryParserPtr parser = newLucene<MultiFieldQueryParser>( LuceneVersion::LUCENE_CURRENT, fields, m_analyzer );
BooleanQueryPtr qry = newLucene<BooleanQuery>(); BooleanQueryPtr qry = newLucene<BooleanQuery>();
@@ -229,8 +229,6 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query )
FuzzyQueryPtr fqry3 = 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>( fqry3 ), BooleanClause::SHOULD ); qry->add( boost::dynamic_pointer_cast<Query>( fqry3 ), BooleanClause::SHOULD );
minScore = 0.00;
} }
else else
{ {
@@ -243,8 +241,6 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query )
FuzzyQueryPtr fqry2 = newLucene<FuzzyQuery>( newLucene<Term>( L"artist", artist.toStdWString() ), 0.5, 3 ); FuzzyQueryPtr fqry2 = newLucene<FuzzyQuery>( newLucene<Term>( L"artist", artist.toStdWString() ), 0.5, 3 );
qry->add( boost::dynamic_pointer_cast<Query>( fqry2 ), BooleanClause::MUST ); qry->add( boost::dynamic_pointer_cast<Query>( fqry2 ), BooleanClause::MUST );
minScore = 0.00;
} }
TopScoreDocCollectorPtr collector = TopScoreDocCollector::create( 20, true ); TopScoreDocCollectorPtr collector = TopScoreDocCollector::create( 20, true );
@@ -254,10 +250,10 @@ FuzzyIndex::search( const Tomahawk::query_ptr& query )
for ( int i = 0; i < collector->getTotalHits() && i < 20; i++ ) for ( int i = 0; i < collector->getTotalHits() && i < 20; i++ )
{ {
DocumentPtr d = m_luceneSearcher->doc( hits[i]->doc ); DocumentPtr d = m_luceneSearcher->doc( hits[i]->doc );
float score = hits[i]->score; const float score = hits[i]->score;
int id = QString::fromStdWString( d->get( L"trackid" ) ).toInt(); const int id = QString::fromStdWString( d->get( L"trackid" ) ).toInt();
if ( score > minScore ) // if ( score > minScore )
{ {
resultsmap.insert( id, score ); resultsmap.insert( id, score );
// tDebug() << "Index hit:" << id << score << QString::fromWCharArray( ((Query*)qry)->toString() ); // tDebug() << "Index hit:" << id << score << QString::fromWCharArray( ((Query*)qry)->toString() );
@@ -286,7 +282,7 @@ FuzzyIndex::searchAlbum( const Tomahawk::query_ptr& query )
try try
{ {
QueryParserPtr parser = newLucene<QueryParser>( LuceneVersion::LUCENE_CURRENT, L"album", m_analyzer ); QueryParserPtr parser = newLucene<QueryParser>( LuceneVersion::LUCENE_CURRENT, L"album", m_analyzer );
QString q = Tomahawk::DatabaseImpl::sortname( query->fullTextQuery() ); const QString q = Tomahawk::DatabaseImpl::sortname( query->fullTextQuery() );
FuzzyQueryPtr qry = newLucene<FuzzyQuery>( newLucene<Term>( L"album", q.toStdWString() ) ); FuzzyQueryPtr qry = newLucene<FuzzyQuery>( newLucene<Term>( L"album", q.toStdWString() ) );
TopScoreDocCollectorPtr collector = TopScoreDocCollector::create( 99999, false ); TopScoreDocCollectorPtr collector = TopScoreDocCollector::create( 99999, false );