tracker r3003 - in trunk: . src/libtracker-db

[mr svn gnome org]

Author: mr
Date: Tue Mar  3 13:40:52 2009
New Revision: 3003
URL: http://svn.gnome.org/viewvc/tracker?rev=3003&view=rev

Log:
	* src/libtracker-db/tracker-db-manager.c:
	(tracker_db_manager_init): Add new DB versions so users are forced
	to reindex when updating from svn or to the next version 0.6.91
	planned for next week. NOTE: Updating to this version *WILL*
	require you reindex your data.


Modified:
   trunk/ChangeLog
   trunk/src/libtracker-db/tracker-db-manager.c

Modified: trunk/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-manager.c	(original)
+++ trunk/src/libtracker-db/tracker-db-manager.c	Tue Mar  3 13:40:52 2009
@@ -49,7 +49,7 @@
 #define TRACKER_DB_MAX_FILE_SIZE      2000000000 
 
 /* Set current database version we are working with */
-#define TRACKER_DB_VERSION_NOW        TRACKER_DB_VERSION_2
+#define TRACKER_DB_VERSION_NOW        TRACKER_DB_VERSION_3
 #define TRACKER_DB_VERSION_FILE       "db-version.txt"
 
 typedef enum {
@@ -60,8 +60,10 @@
 
 typedef enum {
 	TRACKER_DB_VERSION_UNKNOWN, /* Unknown */
-	TRACKER_DB_VERSION_1,       /* TRUNK before indexer-split */
-	TRACKER_DB_VERSION_2        /* The indexer-split branch */
+	TRACKER_DB_VERSION_1,       /* Version 0.6.6  (before indexer-split) */
+	TRACKER_DB_VERSION_2,       /* Version 0.6.90 (after  indexer-split) */
+	TRACKER_DB_VERSION_3,       /* Version 0.6.91 (current TRUNK) */
+	TRACKER_DB_VERSION_4        /* Version 0.7    (vstore branch) */
 } TrackerDBVersion;
 
 typedef struct {
@@ -2503,7 +2505,6 @@
 		/* Check version is correct */
 		if (G_LIKELY (g_file_get_contents (filename, &contents, NULL, NULL))) {
 			if (contents && strlen (contents) <= 2) {
-
 				version = atoi (contents);
 			} else {
 				g_message ("  Version file content size is either 0 or bigger than expected");
@@ -2711,8 +2712,7 @@
 
 	version = db_get_version ();
 
-	if (version == TRACKER_DB_VERSION_UNKNOWN ||
-	    version == TRACKER_DB_VERSION_1) {
+	if (version < TRACKER_DB_VERSION_NOW) {
 		g_message ("  A reindex will be forced");
 		need_reindex = TRUE;
 	}