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

[mr svn gnome org]

Author: mr
Date: Mon Jun 23 11:59:10 2008
New Revision: 1736
URL: http://svn.gnome.org/viewvc/tracker?rev=1736&view=rev

Log:
	* src/libtracker-db/tracker-db-manager.[ch]: 
	* src/tracker-indexer/tracker-main.c:
	* src/trackerd/tracker-main.c: Make the force_reindex, remove
	cache and attach all settings into a flag we pass when
	initialising the database manager.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-manager.c
   branches/indexer-split/src/libtracker-db/tracker-db-manager.h
   branches/indexer-split/src/tracker-indexer/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-main.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c	Mon Jun 23 11:59:10 2008
@@ -2159,9 +2159,8 @@
 }
 
 void
-tracker_db_manager_init (gboolean  attach_all_dbs,
-			 gboolean  force_reindex,
-			 gboolean *first_time_index)
+tracker_db_manager_init (TrackerDBManagerFlags  flags,
+			 gboolean              *first_time)
 {
 	GType        etype;
 	gchar       *filename;
@@ -2169,8 +2168,8 @@
 	gboolean     need_reindex;
 	guint        i;
 
-	if (first_time_index) {
-		*first_time_index = FALSE;
+	if (first_time) {
+		*first_time = FALSE;
 	}
 
         if (initialized) {
@@ -2261,9 +2260,9 @@
 	 * NOT the paths, note, that these paths are also used for
 	 * other things like the nfs lock file.
 	 */
-	if (force_reindex || need_reindex) {
-		if (first_time_index) {
-			*first_time_index = TRUE;
+	if (flags & TRACKER_DB_MANAGER_FORCE_REINDEX || need_reindex) {
+		if (first_time) {
+			*first_time = TRUE;
 		}
 
 		g_message ("Removing database files for reindex");
@@ -2308,15 +2307,17 @@
 		 * each time we start up, this is meant to be a per-run
 		 * thing.
 		 */
-		g_message ("Removing cache database:'%s'", 
-			   dbs[TRACKER_DB_CACHE].abs_filename);
-		g_unlink (dbs[TRACKER_DB_CACHE].abs_filename);
+		if (flags & TRACKER_DB_MANAGER_REMOVE_CACHE) {
+			g_message ("Removing cache database:'%s'", 
+				   dbs[TRACKER_DB_CACHE].abs_filename);
+			g_unlink (dbs[TRACKER_DB_CACHE].abs_filename);
+		}
 
 		/* Make sure we initialize all other modules we depend on */
 		tracker_ontology_init ();
 	}
 
-	attach_all = attach_all_dbs;
+	attach_all = flags & TRACKER_DB_MANAGER_ATTACH_ALL;
 
 	/* Load databases */
 	g_message ("Loading databases files...");

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.h	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.h	Mon Jun 23 11:59:10 2008
@@ -39,23 +39,28 @@
 	TRACKER_DB_XESAM,
 } TrackerDB;
 
+typedef enum {
+	TRACKER_DB_MANAGER_ATTACH_ALL    = 1 << 0,
+	TRACKER_DB_MANAGER_FORCE_REINDEX = 1 << 1,
+	TRACKER_DB_MANAGER_REMOVE_CACHE  = 1 << 2,
+} TrackerDBManagerFlags;
+
 GType        tracker_db_get_type                            (void) G_GNUC_CONST;
 
-void         tracker_db_manager_init                        (gboolean            attach_all_dbs,
-							     gboolean            force_reindex,
-							     gboolean           *first_time_index);
+void         tracker_db_manager_init                        (TrackerDBManagerFlags  flags,
+							     gboolean              *first_time);
 void         tracker_db_manager_shutdown                    (void);
 
 void         tracker_db_manager_close_all                   (void);
 
-const gchar *tracker_db_manager_get_file                    (TrackerDB           db);
+const gchar *tracker_db_manager_get_file                    (TrackerDB              db);
 TrackerDBInterface *
-             tracker_db_manager_get_db_interface            (TrackerDB           db);
+             tracker_db_manager_get_db_interface            (TrackerDB              db);
 TrackerDBInterface *
-             tracker_db_manager_get_db_interface_by_service (const gchar        *service, 
-							     gboolean            content);
+             tracker_db_manager_get_db_interface_by_service (const gchar           *service, 
+							     gboolean               content);
 TrackerDBInterface *
-             tracker_db_manager_get_db_interface_content    (TrackerDBInterface *iface);
+             tracker_db_manager_get_db_interface_content    (TrackerDBInterface    *iface);
 
 G_END_DECLS
 

Modified: branches/indexer-split/src/tracker-indexer/tracker-main.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-main.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-main.c	Mon Jun 23 11:59:10 2008
@@ -148,7 +148,7 @@
 	sys_tmp_dir = g_build_filename (g_get_tmp_dir (), filename, NULL);
 	g_free (filename);
 
-	tracker_db_manager_init (FALSE, FALSE, NULL);
+	tracker_db_manager_init (0, NULL);
 
 	g_free (data_dir);
 	g_free (user_data_dir);

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Mon Jun 23 11:59:10 2008
@@ -666,10 +666,11 @@
 gint
 main (gint argc, gchar *argv[])
 {
-	GOptionContext *context = NULL;
-	GOptionGroup   *group;
-	GError         *error = NULL;
-	GSList         *l;
+	GOptionContext        *context = NULL;
+	GOptionGroup          *group;
+	GError                *error = NULL;
+	GSList                *l;
+	TrackerDBManagerFlags  flags;
 
         g_type_init ();
         
@@ -800,7 +801,15 @@
 	sanity_check_option_values ();
 
 	tracker_nfs_lock_init (tracker_config_get_nfs_locking (tracker->config));
-	tracker_db_manager_init (TRUE, reindex, &tracker->first_time_index); 
+
+	flags = TRACKER_DB_MANAGER_ATTACH_ALL |
+		TRACKER_DB_MANAGER_REMOVE_CACHE;
+
+	if (reindex) {
+		flags |= TRACKER_DB_MANAGER_FORCE_REINDEX;
+	}
+
+	tracker_db_manager_init (flags, &tracker->first_time_index);
 	tracker_db_init ();
 	tracker_xesam_manager_init ();
 	tracker_email_start_email_watching (tracker_config_get_email_client (tracker->config));