tracker r2944 - in trunk: . src/tracker-indexer src/trackerd

[mr svn gnome org]

Author: mr
Date: Wed Feb 18 18:58:33 2009
New Revision: 2944
URL: http://svn.gnome.org/viewvc/tracker?rev=2944&view=rev

Log:
	* src/tracker-indexer/tracker-indexer.c: Reset stats after we issue
	finished signal.

	* src/trackerd/tracker-processor.c: Small code cleanup.


Modified:
   trunk/ChangeLog
   trunk/src/tracker-indexer/tracker-indexer.c
   trunk/src/trackerd/tracker-processor.c

Modified: trunk/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-indexer.c	(original)
+++ trunk/src/tracker-indexer/tracker-indexer.c	Wed Feb 18 18:58:33 2009
@@ -697,6 +697,12 @@
 		       indexer->private->items_processed,
 		       indexer->private->items_indexed,
 		       interrupted);
+
+	/* Reset stats */
+	indexer->private->items_processed = 0;
+	indexer->private->items_indexed = 0;
+	indexer->private->items_to_index = 0;
+	indexer->private->subelements_processed = 0;
 }
 
 static gboolean

Modified: trunk/src/trackerd/tracker-processor.c
==============================================================================
--- trunk/src/trackerd/tracker-processor.c	(original)
+++ trunk/src/trackerd/tracker-processor.c	Wed Feb 18 18:58:33 2009
@@ -1082,7 +1082,7 @@
 		   gpointer	user_data)
 {
 	TrackerProcessor *processor;
-	TrackerDBIndex	 *lindex;
+	TrackerDBIndex	 *index;
 	GQueue		 *queue;
 	GFile		 *file;
 	gchar		 *path = NULL;
@@ -1123,11 +1123,11 @@
 	 * module_name->index type so we don't do this for both
 	 * every time:
 	 */
-	lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
-	tracker_db_index_set_reload (lindex, TRUE);
+	index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
+	tracker_db_index_set_reload (index, TRUE);
 
-	lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
-	tracker_db_index_set_reload (lindex, TRUE);
+	index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
+	tracker_db_index_set_reload (index, TRUE);
 
 	/* Message to the console about state */
 	str1 = tracker_seconds_estimate_to_string (seconds_elapsed,
@@ -1157,7 +1157,7 @@
 		     gpointer	  user_data)
 {
 	TrackerProcessor *processor;
-	TrackerDBIndex	 *lindex;
+	TrackerDBIndex	 *index;
 	GObject		 *object;
 	gchar		 *str;
 
@@ -1182,11 +1182,11 @@
 	 * module_name->index type so we don't do this for both
 	 * every time:
 	 */
-	lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
-	tracker_db_index_set_reload (lindex, TRUE);
+	index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
+	tracker_db_index_set_reload (index, TRUE);
 
-	lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
-	tracker_db_index_set_reload (lindex, TRUE);
+	index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
+	tracker_db_index_set_reload (index, TRUE);
 
 	/* Message to the console about state */
 	str = tracker_seconds_to_string (seconds_elapsed, FALSE);