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

[mr svn gnome org]

Author: mr
Date: Thu Aug  7 12:05:09 2008
New Revision: 2027
URL: http://svn.gnome.org/viewvc/tracker?rev=2027&view=rev

Log:
	* src/trackerd/tracker-main.c: (main): Fix the flag setting here.


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

Modified: branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c	Thu Aug  7 12:05:09 2008
@@ -139,6 +139,8 @@
 	gchar    *final_index_filename;
 	gchar    *name;
 	gboolean  need_reindex = FALSE;
+	gboolean  force_reindex;
+	gboolean  readonly;
 	guint     i;
 
 	g_return_val_if_fail (min_bucket >= 0, FALSE);
@@ -193,7 +195,10 @@
 	/* Now we have cleaned up merge files, see if we are supposed
 	 * to be reindexing.
 	 */ 
-	if (flags & TRACKER_DB_INDEX_MANAGER_FORCE_REINDEX || need_reindex) {
+
+	force_reindex = (flags & TRACKER_DB_INDEX_MANAGER_FORCE_REINDEX) != 0;
+
+	if (force_reindex || need_reindex) {
 		g_message ("Cleaning up index files for reindex");
 
 		for (i = 0; i < G_N_ELEMENTS (indexes); i++) {
@@ -203,11 +208,13 @@
 
 	g_message ("Creating index files, this may take a few moments...");
 	
+	readonly = (flags & TRACKER_DB_INDEX_MANAGER_READONLY) != 0;
+
 	for (i = 0; i < G_N_ELEMENTS (indexes); i++) {
 		indexes[i].index = tracker_db_index_new (indexes[i].abs_filename,
 							 min_bucket, 
 							 max_bucket, 
-							 flags & TRACKER_DB_INDEX_MANAGER_READONLY);
+							 readonly);
 	}
 
         initialized = TRUE;

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	Thu Aug  7 12:05:09 2008
@@ -538,8 +538,8 @@
         TrackerDBIndex             *index;
         TrackerDBIndex             *index_update;
 	TrackerRunningLevel         runtime_level;
-	TrackerDBManagerFlags       flags;
-	TrackerDBIndexManagerFlags  index_flags;
+	TrackerDBManagerFlags       flags = 0;
+	TrackerDBIndexManagerFlags  index_flags = 0;
 
         g_type_init ();
         
@@ -681,8 +681,8 @@
 
         tracker_module_config_init ();
 
-	flags = TRACKER_DB_MANAGER_REMOVE_CACHE;
-	index_flags = 0;
+	flags |= TRACKER_DB_MANAGER_REMOVE_CACHE;
+	index_flags |= TRACKER_DB_INDEX_MANAGER_READONLY;
 
 	if (force_reindex) {
 		flags |= TRACKER_DB_MANAGER_FORCE_REINDEX;