tracker r1940 - in branches/indexer-split: . src/trackerd tests/trackerd

[mr svn gnome org]

Author: mr
Date: Fri Jul 25 14:44:12 2008
New Revision: 1940
URL: http://svn.gnome.org/viewvc/tracker?rev=1940&view=rev

Log:
	* src/trackerd/tracker-processor.c: (indexer_status_cb),
	(indexer_finished_cb): Call the index reload function when we get
	status updates from the indexer.

	* tests/trackerd/tracker-indexer-test.c: Renamed to reflect new
	TrackerIndex name.


Added:
   branches/indexer-split/tests/trackerd/tracker-index-test.c
      - copied unchanged from r1938, /branches/indexer-split/tests/trackerd/tracker-indexer-test.c
Removed:
   branches/indexer-split/tests/trackerd/tracker-indexer-test.c
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-processor.c

Modified: branches/indexer-split/src/trackerd/tracker-processor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-processor.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-processor.c	Fri Jul 25 14:44:12 2008
@@ -35,6 +35,8 @@
 #include "tracker-crawler.h"
 #include "tracker-daemon.h"
 #include "tracker-dbus.h"
+#include "tracker-index.h"
+#include "tracker-index-manager.h"
 #include "tracker-indexer-client.h"
 #include "tracker-monitor.h"
 #include "tracker-status.h"
@@ -878,6 +880,7 @@
 		   gpointer     user_data)
 {
 	TrackerProcessorPrivate *priv;
+	TrackerIndex            *index;
 	GQueue                  *queue;
 	GFile                   *file;
 	gchar                   *path = NULL;
@@ -895,6 +898,7 @@
 		return;
 	}
 
+	/* Signal to any applications */
 	queue = g_hash_table_lookup (priv->items_created_queues, current_module_name);
 	file = g_queue_peek_tail (queue);
 	if (file) {
@@ -910,6 +914,17 @@
 			       priv->items_done + priv->items_remaining); /* files */
 	g_free (path);
 
+	/* Tell the index that it can reload, really we should do
+	 * module_name->index type so we don't do this for both
+	 * every time:
+	 */
+	index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_FILES);
+	tracker_index_set_reload (index, TRUE);
+
+	index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_EMAILS);
+	tracker_index_set_reload (index, TRUE);
+
+	/* Message to the console about state */
 	str1 = tracker_seconds_estimate_to_string (seconds_elapsed, 
 						   TRUE,
 						   items_done, 
@@ -935,11 +950,13 @@
 {
 	TrackerProcessor        *processor;
 	TrackerProcessorPrivate *priv;
+	TrackerIndex            *index;
 	gchar                   *str;
 
 	processor = TRACKER_PROCESSOR (user_data);
 	priv = TRACKER_PROCESSOR_GET_PRIVATE (processor);
 
+	/* Signal to any applications */
 	g_signal_emit_by_name (tracker_dbus_get_object (TRACKER_TYPE_DAEMON),
 			       "index-progress",
 			       "", /* Service */
@@ -948,6 +965,17 @@
 			       priv->items_remaining,                     /* files */
 			       priv->items_done + priv->items_remaining); /* files */
 
+	/* Tell the index that it can reload, really we should do
+	 * module_name->index type so we don't do this for both
+	 * every time:
+	 */
+	index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_FILES);
+	tracker_index_set_reload (index, TRUE);
+
+	index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_EMAILS);
+	tracker_index_set_reload (index, TRUE);
+
+	/* Message to the console about state */
 	str = tracker_seconds_to_string (seconds_elapsed, FALSE);
 
 	g_message ("Indexer finished in %s, %d items indexed in total",
@@ -955,6 +983,7 @@
 		   items_done);
 	g_free (str);
 
+
 	/* Do we even need this step Optimizing ? */
 	tracker_status_set_and_signal (TRACKER_STATUS_OPTIMIZING);