tracker r1362 - in branches/indexer-split: . src/trackerd



Author: mr
Date: Wed May  7 12:14:07 2008
New Revision: 1362
URL: http://svn.gnome.org/viewvc/tracker?rev=1362&view=rev

Log:
	* configure.ac:
	* src/trackerd/tracker-cache.c:
	* src/trackerd/tracker-db-sqlite.c:
	* src/trackerd/tracker-dbus-daemon.c:
	* src/trackerd/tracker-email-evolution.c:
	* src/trackerd/tracker-email-modest.c:
	* src/trackerd/tracker-indexer.[ch]:
	* src/trackerd/tracker-process-files.c:
	* src/trackerd/tracker-utils.[ch]:
	* src/trackerd/trackerd.c: Removed tracker_is_index_too_big() from
	tracker-utils.c to tracker-indexer.c and also made all database
	filenames in the code use a defined filename. The tracker_pause()
	and tracker_pause_on_battery() now has been renamed to
	tracker_should_pause...() and cleaned up.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-cache.c
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-dbus-daemon.c
   branches/indexer-split/src/trackerd/tracker-email-evolution.c
   branches/indexer-split/src/trackerd/tracker-email-modest.c
   branches/indexer-split/src/trackerd/tracker-indexer.c
   branches/indexer-split/src/trackerd/tracker-indexer.h
   branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-utils.c
   branches/indexer-split/src/trackerd/tracker-utils.h
   branches/indexer-split/src/trackerd/trackerd.c

Modified: branches/indexer-split/src/trackerd/tracker-cache.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-cache.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-cache.c	Wed May  7 12:14:07 2008
@@ -328,7 +328,8 @@
 			sleep = TRUE;
 		}
 
-		if (tracker->index_status > INDEX_APPLICATIONS && tracker_pause ()) {
+		if (tracker->index_status > INDEX_APPLICATIONS && 
+                    tracker_should_pause ()) {
 			if (db_con) {
 				stopped_trans = TRUE;
 			}
@@ -347,11 +348,11 @@
                                                tracker->first_time_index,
                                                tracker->in_merge,
                                                tracker->pause_manual,
-                                               tracker_pause_on_battery (),
+                                               tracker_should_pause_on_battery (),
                                                tracker->pause_io,
                                                tracker_config_get_enable_indexing (tracker->config));
 			
-			if (tracker_pause ()) {
+			if (tracker_should_pause ()) {
 				g_cond_wait (tracker->files_signal_cond, 
                                              tracker->files_signal_mutex);
 			} else {
@@ -381,7 +382,7 @@
                                                        tracker->first_time_index,
                                                        tracker->in_merge,
                                                        tracker->pause_manual,
-                                                       tracker_pause_on_battery (),
+                                                       tracker_should_pause_on_battery (),
                                                        tracker->pause_io,
                                                        tracker_config_get_enable_indexing (tracker->config));
 				continue;
@@ -409,7 +410,7 @@
                                                tracker->first_time_index,
                                                tracker->in_merge,
                                                tracker->pause_manual,
-                                               tracker_pause_on_battery (),
+                                               tracker_should_pause_on_battery (),
                                                tracker->pause_io,
                                                tracker_config_get_enable_indexing (tracker->config));
 		
@@ -432,7 +433,7 @@
                                                        tracker->first_time_index,
                                                        tracker->in_merge,
                                                        tracker->pause_manual,
-                                                       tracker_pause_on_battery (),
+                                                       tracker_should_pause_on_battery (),
                                                        tracker->pause_io,
                                                        tracker_config_get_enable_indexing (tracker->config));
 			}

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.c	Wed May  7 12:14:07 2008
@@ -513,7 +513,7 @@
 {
 	gboolean create;
 
-	db_con->db = open_user_db ("common.db", &create);
+	db_con->db = open_user_db (TRACKER_INDEXER_COMMON_DB_FILENAME, &create);
 
 	set_params (db_con, 32, FALSE);
 
@@ -544,10 +544,10 @@
 	gchar *path;
 
 	if (strcmp (name, "common") == 0) {
-		path = g_build_filename (tracker->user_data_dir, "common.db", NULL);
+		path = g_build_filename (tracker->user_data_dir, TRACKER_INDEXER_COMMON_DB_FILENAME, NULL);
 		tracker_db_exec_no_reply (db_con, "ATTACH '%s' as %s", path, name);
 	} else if (strcmp (name, "cache") == 0) {
-		path = g_build_filename (tracker->sys_tmp_root_dir, "cache.db", NULL);
+		path = g_build_filename (tracker->sys_tmp_root_dir, TRACKER_INDEXER_CACHE_DB_FILENAME, NULL);
 		tracker_db_exec_no_reply (db_con, "ATTACH '%s' as %s", path, name);
 	}
 
@@ -722,7 +722,7 @@
 	gboolean create_table = FALSE;
 	char *dbname;
 
-	dbname = g_build_filename (tracker->data_dir, "file-meta.db", NULL);
+	dbname = g_build_filename (tracker->data_dir, TRACKER_INDEXER_FILE_META_DB_FILENAME, NULL);
 
 	if (!g_file_test (dbname, G_FILE_TEST_IS_REGULAR)) {
 		tracker_log ("database file %s is not present - will create", dbname);
@@ -795,7 +795,7 @@
 {
 	gboolean create;
 
-	db_con->db = open_db ("file-meta.db", &create);	
+	db_con->db = open_db (TRACKER_INDEXER_FILE_META_DB_FILENAME, &create);	
 
 	set_params (db_con, 512, TRUE);
 }
@@ -818,7 +818,7 @@
 {
 	gboolean create;
 
-	db_con->db = open_db ("email-meta.db", &create);	
+	db_con->db = open_db (TRACKER_INDEXER_EMAIL_META_DB_FILENAME, &create);	
 
 	set_params (db_con, 512, TRUE);
 }
@@ -843,7 +843,7 @@
 {
 	gboolean create;
 
-	db_con->db = open_db ("file-contents.db", &create);	
+	db_con->db = open_db (TRACKER_INDEXER_FILE_CONTENTS_DB_FILENAME, &create);	
 
 	set_params (db_con, 1024, FALSE);
 
@@ -875,7 +875,7 @@
 {
 	gboolean create;
 
-	db_con->db = open_db ("email-contents.db", &create);	
+	db_con->db = open_db (TRACKER_INDEXER_EMAIL_CONTENTS_DB_FILENAME, &create);	
 
 	set_params (db_con, 512, FALSE);
 
@@ -976,7 +976,7 @@
 		exit (1);
 	}
 
-	dbname = g_build_filename (tracker->sys_tmp_root_dir, "cache.db", NULL);
+	dbname = g_build_filename (tracker->sys_tmp_root_dir, TRACKER_INDEXER_CACHE_DB_FILENAME, NULL);
 
 	if (!tracker_file_is_valid (dbname)) {
 		create_table = TRUE;
@@ -1014,7 +1014,7 @@
 	
 	create_table = FALSE;
 
-	dbname = g_build_filename (tracker->data_dir, "email-meta.db", NULL);
+	dbname = g_build_filename (tracker->data_dir, TRACKER_INDEXER_EMAIL_META_DB_FILENAME, NULL);
 
 
 	if (!g_file_test (dbname, G_FILE_TEST_IS_REGULAR)) {
@@ -1303,7 +1303,9 @@
 gboolean
 tracker_db_needs_setup ()
 {
-	return (!db_exists ("file-meta.db") || !db_exists ("file-index.db") || !db_exists ("file-contents.db"));
+	return (!db_exists (TRACKER_INDEXER_FILE_META_DB_FILENAME) || 
+		!db_exists (TRACKER_INDEXER_FILE_INDEX_DB_FILENAME) || 
+		!db_exists (TRACKER_INDEXER_FILE_CONTENTS_DB_FILENAME));
 }
 
 
@@ -1315,7 +1317,7 @@
 
 	need_setup = FALSE;
 
-	dbname = g_build_filename (tracker->user_data_dir, "common.db", NULL);
+	dbname = g_build_filename (tracker->user_data_dir, TRACKER_INDEXER_COMMON_DB_FILENAME, NULL);
 
 	if (!g_file_test (dbname, G_FILE_TEST_EXISTS)) {
 		need_setup = TRUE;

Modified: branches/indexer-split/src/trackerd/tracker-dbus-daemon.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-daemon.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-daemon.c	Wed May  7 12:14:07 2008
@@ -457,7 +457,7 @@
 				       priv->tracker->first_time_index,
 				       priv->tracker->in_merge,
 				       priv->tracker->pause_manual,
-				       tracker_pause_on_battery (),
+				       tracker_should_pause_on_battery (),
 				       priv->tracker->pause_io,
 				       tracker_config_get_enable_indexing (priv->config));
 	}
@@ -562,7 +562,7 @@
 			       priv->tracker->first_time_index,
 			       priv->tracker->in_merge,
 			       priv->tracker->pause_manual,
-			       tracker_pause_on_battery (),
+			       tracker_should_pause_on_battery (),
 			       priv->tracker->pause_io,
 			       tracker_config_get_enable_indexing (priv->config));
 

Modified: branches/indexer-split/src/trackerd/tracker-email-evolution.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-evolution.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-evolution.c	Wed May  7 12:14:07 2008
@@ -1448,7 +1448,7 @@
                                                                        tracker->first_time_index,
                                                                        tracker->in_merge,
                                                                        tracker->pause_manual,
-                                                                       tracker_pause_on_battery (),
+                                                                       tracker_should_pause_on_battery (),
                                                                        tracker->pause_io,
                                                                        tracker_config_get_enable_indexing (tracker->config));
 					return;

Modified: branches/indexer-split/src/trackerd/tracker-email-modest.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-modest.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-modest.c	Wed May  7 12:14:07 2008
@@ -938,7 +938,7 @@
                                                                        tracker->first_time_index,
                                                                        tracker->in_merge,
                                                                        tracker->pause_manual,
-                                                                       tracker_pause_on_battery (),
+                                                                       tracker_should_pause_on_battery (),
                                                                        tracker->pause_io,
                                                                        tracker_config_get_enable_indexing (tracker->config));
 					return;

Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c	Wed May  7 12:14:07 2008
@@ -26,9 +26,10 @@
 #define __USE_ISOC99     1
 
 /* Size of free block pool of inverted index */
-#define INDEXFBP         32     
-#define SCORE_MULTIPLIER 100000
-#define MAX_HIT_BUFFER 480000
+#define INDEXFBP            32     
+#define SCORE_MULTIPLIER    100000
+#define MAX_HIT_BUFFER      480000
+#define MAX_INDEX_FILE_SIZE 2000000000
 
 #define CREATE_INDEX                                                      \
         "CREATE TABLE HitIndex (Word Text not null "                      \
@@ -49,6 +50,7 @@
 
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-config.h>
+#include <libtracker-common/tracker-file-utils.h>
 
 #include "tracker-query-tree.h"
 #include "tracker-indexer.h"
@@ -456,7 +458,7 @@
 	tracker_indexer_free (src, TRUE);
 
 	if (update) {
-		tracker->file_update_index = tracker_indexer_open ("file-update-index.db", FALSE);
+		tracker->file_update_index = tracker_indexer_open (TRACKER_INDEXER_FILE_UPDATE_INDEX_DB_FILENAME, FALSE);
 	}
 	
 	tracker->in_merge = FALSE;
@@ -693,7 +695,7 @@
 			       tracker->first_time_index,
 			       tracker->in_merge,
 			       tracker->pause_manual,
-			       tracker_pause_on_battery (),
+			       tracker_should_pause_on_battery (),
 			       tracker->pause_io,
 			       tracker_config_get_enable_indexing (tracker->config));
 
@@ -732,7 +734,7 @@
                                                                                tracker->first_time_index,
                                                                                tracker->in_merge,
                                                                                tracker->pause_manual,
-                                                                               tracker_pause_on_battery (),
+                                                                               tracker_should_pause_on_battery (),
                                                                                tracker->pause_io,
                                                                                tracker_config_get_enable_indexing (tracker->config));
 						return;	
@@ -838,12 +840,12 @@
 		} else {
 			if (type == INDEX_TYPE_FILES) {
 
-				char *fname = get_index_file ("file-index.db");
+				char *fname = get_index_file (TRACKER_INDEXER_FILE_INDEX_DB_FILENAME);
 				move_index (final_index, tracker->file_index, fname);	
 				g_free (fname);
 
 			} else {
-				char *fname = get_index_file ("email-index.db");
+				char *fname = get_index_file (TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME);
 				move_index (final_index, tracker->email_index, fname);
 				g_free (fname);
 			}
@@ -864,7 +866,7 @@
                                tracker->first_time_index,
                                tracker->in_merge,
                                tracker->pause_manual,
-                               tracker_pause_on_battery (),
+                               tracker_should_pause_on_battery (),
                                tracker->pause_io,
                                tracker_config_get_enable_indexing (tracker->config));
 }
@@ -1380,3 +1382,48 @@
 
         return winner_str;
 }
+
+gboolean
+tracker_indexer_are_databases_too_big (void)
+{
+	gchar    *filename;
+        gboolean  too_big;
+
+	filename = g_build_filename (tracker->data_dir, TRACKER_INDEXER_FILE_INDEX_DB_FILENAME, NULL);
+	too_big = tracker_file_get_size (filename) > MAX_INDEX_FILE_SIZE;
+        g_free (filename);
+        
+        if (too_big) {
+		tracker_error ("File index database is too big, discontinuing indexing");
+		return TRUE;	
+	}
+
+	filename = g_build_filename (tracker->data_dir, TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME, NULL);
+	too_big = tracker_file_get_size (filename) > MAX_INDEX_FILE_SIZE;
+	g_free (filename);
+        
+        if (too_big) {
+		tracker_error ("Email index database is too big, discontinuing indexing");
+		return TRUE;	
+	}
+
+	filename = g_build_filename (tracker->data_dir, TRACKER_INDEXER_FILE_META_DB_FILENAME, NULL);
+	too_big = tracker_file_get_size (filename) > MAX_INDEX_FILE_SIZE;
+        g_free (filename);
+        
+        if (too_big) {
+                tracker_error ("File metadata database is too big, discontinuing indexing");
+		return TRUE;	
+	}
+
+	filename = g_build_filename (tracker->data_dir, TRACKER_INDEXER_EMAIL_META_DB_FILENAME, NULL);
+	too_big = tracker_file_get_size (filename) > MAX_INDEX_FILE_SIZE;
+        g_free (filename);
+        
+        if (too_big) {
+		tracker_error ("Email metadata database is too big, discontinuing indexing");
+		return TRUE;	
+	}
+
+	return FALSE;
+}

Modified: branches/indexer-split/src/trackerd/tracker-indexer.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.h	Wed May  7 12:14:07 2008
@@ -17,8 +17,6 @@
  * Boston, MA  02110-1301, USA.
  */
 
-
-
 #ifndef _TRACKER_INDEXER_H
 #define _TRACKER_INDEXER_H
 
@@ -28,6 +26,15 @@
 
 #include <libtracker-db/tracker-db-interface.h>
 
+#define TRACKER_INDEXER_COMMON_DB_FILENAME             "common.db"
+#define TRACKER_INDEXER_CACHE_DB_FILENAME              "cache.db"
+#define TRACKER_INDEXER_FILE_UPDATE_INDEX_DB_FILENAME  "file-update-index.db"
+#define TRACKER_INDEXER_FILE_CONTENTS_DB_FILENAME      "file-contents.db"
+#define TRACKER_INDEXER_FILE_INDEX_DB_FILENAME         "file-index.db"
+#define TRACKER_INDEXER_FILE_META_DB_FILENAME          "file-meta.db"
+#define TRACKER_INDEXER_EMAIL_CONTENTS_DB_FILENAME     "email-contents.db"
+#define TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME        "email-index.db"
+#define TRACKER_INDEXER_EMAIL_META_DB_FILENAME         "email-meta.db"
 
 typedef struct {                         /* type of structure for an element of search result */
 	guint32 	id;              /* Service ID number of the document */
@@ -92,6 +99,9 @@
 
 char *          tracker_indexer_get_suggestion          (Indexer *indexer, const gchar *term, gint maxdist);
 
+gboolean        tracker_indexer_are_databases_too_big   (void);
+
+/* Word API */
 guint8          tracker_word_details_get_service_type   (WordDetails *details);
 gint16          tracker_word_details_get_score          (WordDetails *details);
 

Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c	Wed May  7 12:14:07 2008
@@ -782,7 +782,7 @@
                                tracker->first_time_index,
                                tracker->in_merge,
                                tracker->pause_manual,
-                               tracker_pause_on_battery (),
+                               tracker_should_pause_on_battery (),
                                tracker->pause_io,
                                tracker_config_get_enable_indexing (tracker->config));
 
@@ -1212,7 +1212,7 @@
                                        tracker->first_time_index,
                                        tracker->in_merge,
                                        tracker->pause_manual,
-                                       tracker_pause_on_battery (),
+                                       tracker_should_pause_on_battery (),
                                        tracker->pause_io,
                                        tracker_config_get_enable_indexing (tracker->config));
 
@@ -1223,7 +1223,7 @@
                                tracker->first_time_index,
                                tracker->in_merge,
                                tracker->pause_manual,
-                               tracker_pause_on_battery (),
+                               tracker_should_pause_on_battery (),
                                tracker->pause_io,
                                tracker_config_get_enable_indexing (tracker->config));
         
@@ -1541,7 +1541,7 @@
                                tracker->first_time_index,
                                tracker->in_merge,
                                tracker->pause_manual,
-                               tracker_pause_on_battery (),
+                               tracker_should_pause_on_battery (),
                                tracker->pause_io,
                                tracker_config_get_enable_indexing (tracker->config));
 
@@ -1583,7 +1583,7 @@
                                                        tracker->first_time_index,
                                                        tracker->in_merge,
                                                        tracker->pause_manual,
-                                                       tracker_pause_on_battery (),
+                                                       tracker_should_pause_on_battery (),
                                                        tracker->pause_io,
                                                        tracker_config_get_enable_indexing (tracker->config));
 			break;	
@@ -1593,7 +1593,7 @@
                                                tracker->first_time_index,
                                                tracker->in_merge,
                                                tracker->pause_manual,
-                                               tracker_pause_on_battery (),
+                                               tracker_should_pause_on_battery (),
                                                tracker->pause_io,
                                                tracker_config_get_enable_indexing (tracker->config));
 
@@ -1679,7 +1679,7 @@
                                                tracker->first_time_index,
                                                tracker->in_merge,
                                                tracker->pause_manual,
-                                               tracker_pause_on_battery (),
+                                               tracker_should_pause_on_battery (),
                                                tracker->pause_io,
                                                tracker_config_get_enable_indexing (tracker->config));
 

Modified: branches/indexer-split/src/trackerd/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-utils.c	Wed May  7 12:14:07 2008
@@ -60,7 +60,6 @@
 extern Tracker	*tracker;
 
 #define ZLIBBUFSIZ 8192
-#define MAX_INDEX_FILE_SIZE 2000000000
 
 static int info_allocated = 0;
 static int info_deallocated = 0;
@@ -919,21 +918,6 @@
 }
 
 gboolean
-tracker_pause_on_battery (void)
-{
-        if (!tracker->pause_battery) {
-                return FALSE;
-        }
-
-	if (tracker->first_time_index) {
-		return tracker_config_get_disable_indexing_on_battery_init (tracker->config);
-	}
-
-        return tracker_config_get_disable_indexing_on_battery (tracker->config);
-}
-
-
-gboolean
 tracker_low_diskspace (void)
 {
 	struct statvfs st;
@@ -961,58 +945,28 @@
 	return FALSE;
 }
 
-
-
 gboolean
-tracker_index_too_big ()
+tracker_should_pause (void)
 {
-
-	
-	char *file_index = g_build_filename (tracker->data_dir, "file-index.db", NULL);
-	if (tracker_file_get_size (file_index) > MAX_INDEX_FILE_SIZE) {
-		tracker_error ("file index is too big - discontinuing index");
-		g_free (file_index);
-		return TRUE;	
-	}
-	g_free (file_index);
-
-
-	char *email_index = g_build_filename (tracker->data_dir, "email-index.db", NULL);
-	if (tracker_file_get_size (email_index) > MAX_INDEX_FILE_SIZE) {
-		tracker_error ("email index is too big - discontinuing index");
-		g_free (email_index);
-		return TRUE;	
-	}
-	g_free (email_index);
-
-
-	char *file_meta = g_build_filename (tracker->data_dir, "file-meta.db", NULL);
-	if (tracker_file_get_size (file_meta) > MAX_INDEX_FILE_SIZE) {
-		tracker_error ("file metadata is too big - discontinuing index");
-		g_free (file_meta);
-		return TRUE;	
-	}
-	g_free (file_meta);
-
-
-	char *email_meta = g_build_filename (tracker->data_dir, "email-meta.db", NULL);
-	if (tracker_file_get_size (email_meta) > MAX_INDEX_FILE_SIZE) {
-		tracker_error ("email metadata is too big - discontinuing index");
-		g_free (email_meta);
-		return TRUE;	
-	}
-	g_free (email_meta);
-
-	return FALSE;
-
+	return  tracker->pause_manual || 
+		tracker_should_pause_on_battery () || 
+		tracker_low_diskspace () || 
+		tracker_indexer_are_databases_too_big ();
 }
 
 gboolean
-tracker_pause (void)
+tracker_should_pause_on_battery (void)
 {
-	return tracker->pause_manual || tracker_pause_on_battery () || tracker_low_diskspace () || tracker_index_too_big ();
-}
+        if (!tracker->pause_battery) {
+                return FALSE;
+        }
+
+	if (tracker->first_time_index) {
+		return tracker_config_get_disable_indexing_on_battery_init (tracker->config);
+	}
 
+        return tracker_config_get_disable_indexing_on_battery (tracker->config);
+}
 
 gchar*
 tracker_unique_key (void)

Modified: branches/indexer-split/src/trackerd/tracker-utils.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-utils.h	Wed May  7 12:14:07 2008
@@ -340,10 +340,11 @@
 gboolean        tracker_watch_dir               (const gchar *uri);
 void            tracker_scan_directory          (const gchar *uri);
 
-gboolean	tracker_pause_on_battery 	(void);
 gboolean	tracker_low_diskspace		(void);
-gboolean	tracker_pause			(void);
 gchar*		tracker_unique_key		(void);
 
+gboolean	tracker_should_pause 	        (void);
+gboolean	tracker_should_pause_on_battery (void);
+
 
 #endif

Modified: branches/indexer-split/src/trackerd/trackerd.c
==============================================================================
--- branches/indexer-split/src/trackerd/trackerd.c	(original)
+++ branches/indexer-split/src/trackerd/trackerd.c	Wed May  7 12:14:07 2008
@@ -872,7 +872,9 @@
 
 /*		turn off corruption check as it can hog cpu for long time 
 
-		if (!tracker_db_integrity_check (db_con) || !tracker_indexer_repair ("file-index.db") || !tracker_indexer_repair ("email-index.db")) {
+		if (!tracker_db_integrity_check (db_con) || 
+		    !tracker_indexer_repair (TRACKER_INDEXER_FILE_INDEX_DB_FILENAME) || 
+		    !tracker_indexer_repair (TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME)) {
 			tracker_error ("db or index corruption detected - prepare for reindex...");
 			tracker_db_close (db_con);	
 
@@ -905,7 +907,7 @@
 	
 	if (g_file_test (final_index_name, G_FILE_TEST_EXISTS) && !tracker_indexer_has_tmp_merge_files (INDEX_TYPE_FILES)) {
 	
-		char *file_index_name = g_build_filename (tracker->data_dir, "file-index.db", NULL);
+		char *file_index_name = g_build_filename (tracker->data_dir, TRACKER_INDEXER_FILE_INDEX_DB_FILENAME, NULL);
 	
 		tracker_log ("overwriting %s with %s", file_index_name, final_index_name);	
 
@@ -920,7 +922,7 @@
 	
 	if (g_file_test (final_index_name, G_FILE_TEST_EXISTS) && !tracker_indexer_has_tmp_merge_files (INDEX_TYPE_EMAILS)) {
 	
-		char *file_index_name = g_build_filename (tracker->data_dir, "email-index.db", NULL);
+		char *file_index_name = g_build_filename (tracker->data_dir, TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME, NULL);
 	
 		tracker_log ("overwriting %s with %s", file_index_name, final_index_name);	
 	
@@ -933,13 +935,13 @@
 	
 	
 
-	Indexer *index = tracker_indexer_open ("file-index.db", TRUE);
+	Indexer *index = tracker_indexer_open (TRACKER_INDEXER_FILE_INDEX_DB_FILENAME, TRUE);
 	tracker->file_index = index;
 
-	index = tracker_indexer_open ("file-update-index.db", FALSE);
+	index = tracker_indexer_open (TRACKER_INDEXER_FILE_UPDATE_INDEX_DB_FILENAME, FALSE);
 	tracker->file_update_index = index;
 
-	index = tracker_indexer_open ("email-index.db", TRUE);
+	index = tracker_indexer_open (TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME, TRUE);
 	tracker->email_index = index;
 
 	db_con->word_index = tracker->file_index;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]