patch-8212-1.txt

Etienne Tourigny, 2013-07-03 10:58 AM

Download (2.47 KB)

 
1
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
2
index 459230b..6382dce 100644
3
--- a/src/core/symbology-ng/qgsstylev2.cpp
4
+++ b/src/core/symbology-ng/qgsstylev2.cpp
5
@@ -746,6 +746,7 @@ bool QgsStyleV2::group( StyleEntity type, QString name, int groupid )
6
 
7
 QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
8
 {
9
+  QgsDebugMsg( "Entered" );
10
   if ( !mCurrentDB )
11
   {
12
     QgsDebugMsg( "Sorry! Cannot open database to search" );
13
@@ -753,8 +754,9 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
14
   }
15
 
16
   QString item = ( type == SymbolEntity ) ? "symbol" : "colorramp";
17
-  char *query = sqlite3_mprintf( "SELECT name FROM %q WHERE xml LIKE '%%%q%%'",
18
+  char *query = sqlite3_mprintf( "SELECT name FROM %q WHERE name LIKE '%%%q%%'",
19
                                   item.toUtf8().constData(), qword.toUtf8().constData() );
20
+  QgsDebugMsg( "query = " + QString( query ) );
21
 
22
   sqlite3_stmt *ppStmt;
23
   int nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
24
@@ -768,6 +770,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
25
   sqlite3_finalize( ppStmt );
26
 
27
   query = sqlite3_mprintf( "SELECT id FROM tag WHERE name LIKE '%%%q%%'", qword.toUtf8().constData() );
28
+  QgsDebugMsg( "query = " + QString( query ) );
29
   nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
30
 
31
   QStringList tagids;
32
@@ -791,6 +794,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
33
     query = sqlite3_mprintf( "SELECT colorramp_id FROM ctagmap WHERE tag_id IN (%q)",
34
                               dummy.toUtf8().constData() );
35
   }
36
+  QgsDebugMsg( "query = " + QString( query ) );
37
   nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
38
 
39
   QStringList symbolids;
40
@@ -805,6 +809,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
41
   dummy = symbolids.join( ", " );
42
   query = sqlite3_mprintf( "SELECT name FROM %q  WHERE id IN (%q)",
43
                             item.toUtf8().constData(), dummy.toUtf8().constData() );
44
+  QgsDebugMsg( "query = " + QString( query ) );
45
   nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
46
   while ( nErr == SQLITE_OK && sqlite3_step( ppStmt ) == SQLITE_ROW )
47
   {
48
@@ -815,6 +820,8 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, QString qword )
49
 
50
   sqlite3_finalize( ppStmt );
51
 
52
+  QgsDebugMsg( QString( "found %1 matching symbols" ).arg( symbols.count() ) );
53
+
54
   return symbols;
55
 }
56