tracker r1922 - in branches/indexer-split: . src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Thu Jul 24 10:32:59 2008
New Revision: 1922
URL: http://svn.gnome.org/viewvc/tracker?rev=1922&view=rev

Log:
2008-07-24  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/tracker-indexer.c: Don't increase incorrectly
        the number of items processed. Also, split Files/Items processed
        count, so we get status signalling correctly, and we still flush when
        processing files with several items in it.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Thu Jul 24 10:32:59 2008
@@ -118,8 +118,9 @@
 	guint pause_for_duration_id;
 	guint flush_id;
 
+	guint files_processed;
+	guint files_indexed;
 	guint items_processed;
-	guint items_indexed;
 
 	gboolean in_transaction;
 	gboolean is_paused;
@@ -204,8 +205,8 @@
 	tracker_db_interface_end_transaction (indexer->private->contents);
 	tracker_db_interface_end_transaction (indexer->private->cache);
 
-	indexer->private->items_indexed += indexer->private->items_processed;
-	indexer->private->items_processed = 0;
+	indexer->private->files_indexed += indexer->private->files_processed;
+	indexer->private->files_processed = 0;
 	indexer->private->in_transaction = FALSE;
 
 	g_debug ("Transaction commit");
@@ -216,25 +217,25 @@
 	       const gchar    *why)
 {
 	gdouble seconds_elapsed;
-	guint   items_remaining;
+	guint   files_remaining;
 
-	items_remaining = g_queue_get_length (indexer->private->file_queue);
+	files_remaining = g_queue_get_length (indexer->private->file_queue);
 	seconds_elapsed = g_timer_elapsed (indexer->private->timer, NULL);
 
-	if (indexer->private->items_indexed > 0 && 
-	    items_remaining > 0) {
+	if (indexer->private->files_indexed > 0 &&
+	    files_remaining > 0) {
 		gchar *str1;
 		gchar *str2;
 
-		str1 = tracker_seconds_estimate_to_string (seconds_elapsed, 
+		str1 = tracker_seconds_estimate_to_string (seconds_elapsed,
 							   TRUE,
-							   indexer->private->items_indexed, 
-							   items_remaining);
+							   indexer->private->files_indexed,
+							   files_remaining);
 		str2 = tracker_seconds_to_string (seconds_elapsed, TRUE);
-		
-		g_message ("Indexed %d/%d, module:'%s', %s left, %s elapsed (%s)", 
-			   indexer->private->items_indexed,
-			   indexer->private->items_indexed + items_remaining,
+
+		g_message ("Indexed %d/%d, module:'%s', %s left, %s elapsed (%s)",
+			   indexer->private->files_indexed,
+			   indexer->private->files_indexed + files_remaining,
 			   indexer->private->current_module_name,
 			   str1,
 			   str2,
@@ -243,12 +244,12 @@
 		g_free (str2);
 		g_free (str1);
 	}
-	
+
 	g_signal_emit (indexer, signals[STATUS], 0, 
 		       seconds_elapsed,
 		       indexer->private->current_module_name,
-		       indexer->private->items_indexed,
-		       items_remaining);
+		       indexer->private->files_indexed,
+		       files_remaining);
 }
 
 static gboolean
@@ -260,7 +261,7 @@
 		stop_transaction (indexer);
 	}
 
-	indexer->private->items_indexed += tracker_index_flush (indexer->private->index);
+	tracker_index_flush (indexer->private->index);
 	signal_status (indexer, "flush");
 
 	return FALSE;
@@ -560,15 +561,15 @@
 	/* Print out how long it took us */
 	str = tracker_seconds_to_string (seconds_elapsed, FALSE);
 
-	g_message ("Indexer finished in %s, %d items indexed in total",
+	g_message ("Indexer finished in %s, %d files indexed in total",
 		   str,
-		   indexer->private->items_indexed);
+		   indexer->private->files_indexed);
 	g_free (str);
 
 	/* Finally signal done */
 	g_signal_emit (indexer, signals[FINISHED], 0, 
 		       seconds_elapsed,
-		       indexer->private->items_indexed);
+		       indexer->private->files_indexed);
 }
 
 static void
@@ -928,6 +929,7 @@
 	if ((path = g_queue_peek_head (indexer->private->file_queue)) != NULL) {
 		/* Process file */
 		if (process_file (indexer, path)) {
+			indexer->private->files_processed++;
 			path = g_queue_pop_head (indexer->private->file_queue);
 			path_info_free (path);
 		}