diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp index 459230b..6382dce 100644 --- a/src/core/symbology-ng/qgsstylev2.cpp +++ b/src/core/symbology-ng/qgsstylev2.cpp @@ -746,6 +746,7 @@ bool QgsStyleV2::group( StyleEntity type, QString name, int groupid ) QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword ) { + QgsDebugMsg( "Entered" ); if ( !mCurrentDB ) { QgsDebugMsg( "Sorry! Cannot open database to search" ); @@ -753,8 +754,9 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword ) } QString item = ( type == SymbolEntity ) ? "symbol" : "colorramp"; - char *query = sqlite3_mprintf( "SELECT name FROM %q WHERE xml LIKE '%%%q%%'", + char *query = sqlite3_mprintf( "SELECT name FROM %q WHERE name LIKE '%%%q%%'", item.toUtf8().constData(), qword.toUtf8().constData() ); + QgsDebugMsg( "query = " + QString( query ) ); sqlite3_stmt *ppStmt; int nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL ); @@ -768,6 +770,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword ) sqlite3_finalize( ppStmt ); query = sqlite3_mprintf( "SELECT id FROM tag WHERE name LIKE '%%%q%%'", qword.toUtf8().constData() ); + QgsDebugMsg( "query = " + QString( query ) ); nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL ); QStringList tagids; @@ -791,6 +794,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword ) query = sqlite3_mprintf( "SELECT colorramp_id FROM ctagmap WHERE tag_id IN (%q)", dummy.toUtf8().constData() ); } + QgsDebugMsg( "query = " + QString( query ) ); nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL ); QStringList symbolids; @@ -805,6 +809,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword ) dummy = symbolids.join( ", " ); query = sqlite3_mprintf( "SELECT name FROM %q WHERE id IN (%q)", item.toUtf8().constData(), dummy.toUtf8().constData() ); + QgsDebugMsg( "query = " + QString( query ) ); nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL ); while ( nErr == SQLITE_OK && sqlite3_step( ppStmt ) == SQLITE_ROW ) { @@ -815,6 +820,8 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword ) sqlite3_finalize( ppStmt ); + QgsDebugMsg( QString( "found %1 matching symbols" ).arg( symbols.count() ) ); + return symbols; }