[anjuta/cxxparser] symbol-db: some code cleaning and bug fixing.

[Massimo Cora' <mcora src gnome org>]

commit 62ee043ffe56b5efeb3729c3a17cfe042ba89d9a
Author: Massimo Corà <mcora src gnome org>
Date:   Tue Aug 18 23:10:13 2009 +0200

    symbol-db: some code cleaning and bug fixing.

 plugins/symbol-db/symbol-db-engine-core.c    |   10 ++++++++--
 plugins/symbol-db/symbol-db-engine-queries.c |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/plugins/symbol-db/symbol-db-engine-core.c b/plugins/symbol-db/symbol-db-engine-core.c
index a5f8ddd..5eb6c59 100644
--- a/plugins/symbol-db/symbol-db-engine-core.c
+++ b/plugins/symbol-db/symbol-db-engine-core.c
@@ -3849,14 +3849,20 @@ sdb_engine_add_new_sym_type (SymbolDBEngine * dbe, const tagEntry * tag_entry)
 	
 	if (g_strcmp0 (type, "member") == 0 || 
 	    g_strcmp0 (type, "variable") == 0 || 
-	    g_strcmp0 (type, "field"))
+	    g_strcmp0 (type, "field") == 0)
 	{
 		type_regex = sdb_engine_extract_type_qualifier (tag_entry->address.pattern, 
 		                                                tag_entry->name);
+		DEBUG_PRINT ("type_regex for %s [kind %s] is %s", tag_entry->name, 
+		             tag_entry->kind, type_regex);
 		type_name = type_regex;
+
+		/* if the extractor failed we should fallback to the default one */
+		if (type_name == NULL)
+			type_name = tag_entry->name;
 	}
 	else 
-	{		
+	{
 		type_name = tag_entry->name;
 	}
 	
diff --git a/plugins/symbol-db/symbol-db-engine-queries.c b/plugins/symbol-db/symbol-db-engine-queries.c
index 2fed656..9b4f535 100644
--- a/plugins/symbol-db/symbol-db-engine-queries.c
+++ b/plugins/symbol-db/symbol-db-engine-queries.c
@@ -2751,7 +2751,7 @@ symbol_db_engine_find_symbol_in_scope (SymbolDBEngine *dbe,
 	MP_SET_HOLDER_BATCH_INT(priv, param, container_symbol_id, ret_bool, ret_value);
 	
 	
-	/* DEBUG_PRINT ("query: %s", dyn_node->query_str); */
+	DEBUG_PRINT ("query: %s", dyn_node->query_str);
 
 	/* execute the query with parametes just set */
 	data = gda_connection_statement_execute_select (priv->db_connection,