tracker r1943 - in branches/indexer-split: . src/libtracker-db src/trackerd

[mr svn gnome org]

Author: mr
Date: Fri Jul 25 21:59:09 2008
New Revision: 1943
URL: http://svn.gnome.org/viewvc/tracker?rev=1943&view=rev

Log:
	* src/libtracker-db/tracker-db-dbus.c:
	(tracker_dbus_query_result_to_ptr_array): Make sure we rewind
	result sets before trying to create GStrv, GPtrArray or GHashTable
	pointers from them. This means the tracker-search-tool now shows a
	list of categories with the indexed count next to them - still not
	sure why the content is not listed but the service types are all
	wrong.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-dbus.c
   branches/indexer-split/src/trackerd/tracker-query-tree.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-dbus.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-dbus.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-dbus.c	Fri Jul 25 21:59:09 2008
@@ -36,6 +36,9 @@
 		gchar    *str;
 		gboolean  valid = TRUE;
 
+		/* Make sure we rewind before iterating the result set */
+		tracker_db_result_set_rewind (result_set);
+
                 rows = tracker_db_result_set_get_n_rows (result_set);
 		strv = g_new (gchar*, rows + 1);
 		
@@ -83,6 +86,11 @@
 
 	if (result_set) {
 		valid = TRUE;
+
+		/* Make sure we rewind before iterating the result set */
+		tracker_db_result_set_rewind (result_set);
+
+		/* Find out how many columns to iterate */
 		field_count = tracker_db_result_set_get_n_columns (result_set);
 	}
 
@@ -145,6 +153,11 @@
 
 	if (result_set) {
 		valid = TRUE;
+
+		/* Make sure we rewind before iterating the result set */
+		tracker_db_result_set_rewind (result_set);
+
+		/* Find out how many columns to iterate */
 		columns = tracker_db_result_set_get_n_columns (result_set);
 	}
 

Modified: branches/indexer-split/src/trackerd/tracker-query-tree.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.c	Fri Jul 25 21:59:09 2008
@@ -277,7 +277,7 @@
 
 TrackerQueryTree *
 tracker_query_tree_new (const gchar     *query_str,
-			TrackerIndex  *index,
+			TrackerIndex    *index,
                         TrackerConfig   *config,
                         TrackerLanguage *language,
 			GArray          *services)