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

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed Aug 20 12:44:52 2008
New Revision: 2110
URL: http://svn.gnome.org/viewvc/tracker?rev=2110&view=rev

Log:
2008-08-19  Philip Van Hoof  <philip codeminded be>

	* src/tracker-indexer/tracker-indexer.c
	* src/tracker-indexer/tracker-indexer.h
	* src/libtracker-db/tracker-db-index.c: There's no need to flush the
	word index on pausing the indexer.



Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-index.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer.h

Modified: branches/indexer-split/src/libtracker-db/tracker-db-index.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index.c	Wed Aug 20 12:44:52 2008
@@ -857,7 +857,6 @@
 						     cache_flush_foreach, 
 						     priv->index);
 		} else {
-			g_warning ("Could not open index, cache was not flushed");
 			size = 0;
 		}
 	}

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	Wed Aug 20 12:44:52 2008
@@ -642,12 +642,12 @@
 	disk_space_low = check_disk_space_low (indexer);
 
 	if (disk_space_low) {
-		tracker_indexer_set_running (indexer, FALSE);
+		tracker_indexer_set_running (indexer, FALSE, TRUE);
 
 		/* The function above stops the low disk check, restart it */
 		check_disk_space_start (indexer);
 	} else {
-		tracker_indexer_set_running (indexer, TRUE);
+		tracker_indexer_set_running (indexer, TRUE, TRUE);
 	}
 
 	return TRUE;
@@ -1767,7 +1767,8 @@
 
 void
 tracker_indexer_set_running (TrackerIndexer *indexer,
-			     gboolean        running)
+			     gboolean        running,
+			     gboolean        flush)
 {
 	gboolean was_running;
 
@@ -1780,7 +1781,8 @@
 	}
 
 	if (!running) {
-		schedule_flush (indexer, TRUE);
+		 if (flush)
+			 schedule_flush (indexer, TRUE);
 		check_disk_space_stop (indexer);
 		signal_status_timeout_stop (indexer);
 
@@ -1833,7 +1835,7 @@
 		tracker_dbus_request_comment (request_id,
 					      "Pausing indexing");
 
-		tracker_indexer_set_running (indexer, FALSE);
+		tracker_indexer_set_running (indexer, FALSE, FALSE);
 	}
 
 	dbus_g_method_return (context);
@@ -1848,7 +1850,7 @@
 
 	indexer = TRACKER_INDEXER (user_data);
 
-	tracker_indexer_set_running (indexer, TRUE);
+	tracker_indexer_set_running (indexer, TRUE, FALSE);
 	indexer->private->pause_for_duration_id = 0;
 
 	return FALSE;
@@ -1879,7 +1881,7 @@
 		tracker_dbus_request_comment (request_id,
 					      "Pausing indexing");
 
-		tracker_indexer_set_running (indexer, FALSE);
+		tracker_indexer_set_running (indexer, FALSE, FALSE);
 
 		indexer->private->pause_for_duration_id =
 			g_timeout_add_seconds (seconds,
@@ -1910,7 +1912,7 @@
 		tracker_dbus_request_comment (request_id,
 					      "Continuing indexing");
 
-		tracker_indexer_set_running (indexer, TRUE);
+		tracker_indexer_set_running (indexer, TRUE, FALSE);
 	}
 
 	dbus_g_method_return (context);

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.h	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.h	Wed Aug 20 12:44:52 2008
@@ -75,7 +75,8 @@
 TrackerIndexer *tracker_indexer_new                (void);
 gboolean        tracker_indexer_get_running        (TrackerIndexer         *indexer);
 void            tracker_indexer_set_running        (TrackerIndexer         *indexer,
-						    gboolean                running);
+						    gboolean                running,
+						    gboolean                flush);
 void            tracker_indexer_stop               (TrackerIndexer         *indexer);
 void            tracker_indexer_process_all        (TrackerIndexer         *indexer);