tracker r2763 - in trunk: . src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Mon Jan  5 16:15:54 2009
New Revision: 2763
URL: http://svn.gnome.org/viewvc/tracker?rev=2763&view=rev

Log:
Updated restore-backup logic

Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-main.c

Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c	(original)
+++ trunk/src/trackerd/tracker-main.c	Mon Jan  5 16:15:54 2009
@@ -111,17 +111,17 @@
 static GStaticPrivate	private_key = G_STATIC_PRIVATE_INIT;
 
 /* Private command line parameters */
-static gint		verbosity = -1;
-static gint		initial_sleep = -1;
-static gboolean		low_memory;
-static gchar	      **monitors_to_exclude;
-static gchar	      **monitors_to_include;
-static gchar	      **crawl_dirs;
-static gchar	      **disable_modules;
-
-static gboolean		force_reindex;
-static gboolean		disable_indexing;
-static gchar	       *language_code;
+static gint		     verbosity = -1;
+static gint		     initial_sleep = -1;
+static gboolean		     low_memory;
+static gchar	           **monitors_to_exclude;
+static gchar	           **monitors_to_include;
+static gchar	           **crawl_dirs;
+static const gchar * const  *disable_modules;
+
+static gboolean		     force_reindex;
+static gboolean		     disable_indexing;
+static gchar	            *language_code;
 
 static GOptionEntry	entries_daemon[] = {
 	{ "verbosity", 'v', 0,
@@ -714,13 +714,17 @@
 		g_debug ("Uninstalling initial crawling callback");
 		g_signal_handler_disconnect (processor, *callback_id);
 
-		org_freedesktop_Tracker_Indexer_restore_backup (tracker_dbus_indexer_get_proxy (), 
-								get_ttl_backup_filename (),
-								&error);
-		rebackup = g_strdup_printf ("%s.old",
-					    get_ttl_backup_filename ());
-		g_rename (get_ttl_backup_filename (), rebackup);
-		g_free (rebackup);
+		if (g_file_test (get_ttl_backup_filename (), G_FILE_TEST_EXISTS)) {
+			org_freedesktop_Tracker_Indexer_restore_backup (tracker_dbus_indexer_get_proxy (), 
+									get_ttl_backup_filename (),
+									&error);
+		
+			rebackup = g_strdup_printf ("%s.old",
+						    get_ttl_backup_filename ());
+			g_rename (get_ttl_backup_filename (), rebackup);
+			g_free (rebackup);
+		}
+
 	} else {
 		g_debug ("%d finished signal", counter);
 	}
@@ -1155,7 +1159,7 @@
 		tracker_status_set_and_signal (TRACKER_STATUS_IDLE);
 	}
 
-	if (flags & TRACKER_DB_MANAGER_FORCE_REINDEX &&
+	if (flags & TRACKER_DB_MANAGER_FORCE_REINDEX ||
 	    g_file_test (get_ttl_backup_filename (), G_FILE_TEST_EXISTS)) {
 		backup_restore_on_crawling_finished (private->processor);
 	}