tracker r1396 - branches/indexer-split/src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Mon May 12 16:20:58 2008
New Revision: 1396
URL: http://svn.gnome.org/viewvc/tracker?rev=1396&view=rev

Log:
Correct database for stats

Modified:
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-dbus-daemon.c

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	Mon May 12 16:20:58 2008
@@ -712,6 +712,7 @@
 static gboolean
 load_service_description_file (DBConnection *db_con, const gchar* filename)
 {
+
 	if (g_str_has_suffix (filename, ".metadata")) {
 		load_metadata_file (db_con, filename);
 
@@ -1126,7 +1127,7 @@
 	DBConnection *db_con;
 	gboolean create_table = FALSE;
 
-	create_table = tracker_db_manager_file_exists (TRACKER_DB_FILE_META);
+	create_table = !tracker_db_manager_file_exists (TRACKER_DB_FILE_META);
 
 	db_con = g_new0 (DBConnection, 1);
 	db_con->db = open_db_interface (TRACKER_DB_FILE_META);
@@ -1211,7 +1212,7 @@
 {
 	gboolean create;
 
-	create = tracker_db_manager_file_exists (TRACKER_DB_FILE_CONTENTS);
+	create = !tracker_db_manager_file_exists (TRACKER_DB_FILE_CONTENTS);
 
 	db_con->db = open_db_interface (TRACKER_DB_FILE_CONTENTS);
 
@@ -1242,13 +1243,13 @@
 static inline void
 open_email_content_db (DBConnection *db_con)
 {
-	gboolean create;
+	gboolean create_table;
 
-	create = tracker_db_manager_file_exists (TRACKER_DB_EMAIL_CONTENTS);
+	create_table = !tracker_db_manager_file_exists (TRACKER_DB_EMAIL_CONTENTS);
 
 	db_con->db = open_db_interface (TRACKER_DB_EMAIL_CONTENTS);
 
-	if (create) {
+	if (create_table) {
 		tracker_db_exec_no_reply (db_con->db, "CREATE TABLE ServiceContents (ServiceID Int not null, MetadataID Int not null, Content Text, primary key (ServiceID, MetadataID))");
 		tracker_log ("Creating db: %s",
 			     tracker_db_manager_get_file (TRACKER_DB_EMAIL_CONTENTS));
@@ -1338,7 +1339,7 @@
 	gboolean     create_table;
 	DBConnection *db_con;
 
-	create_table = tracker_db_manager_file_exists (TRACKER_DB_CACHE);
+	create_table = !tracker_db_manager_file_exists (TRACKER_DB_CACHE);
 
 	db_con = g_new0 (DBConnection, 1);
 
@@ -1367,7 +1368,7 @@
 	gboolean     create_table;
 	DBConnection *db_con;
 	
-	create_table = tracker_db_manager_file_exists (TRACKER_DB_EMAIL_META);
+	create_table = !tracker_db_manager_file_exists (TRACKER_DB_EMAIL_META);
 
 	db_con = g_new0 (DBConnection, 1);
 

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	Mon May 12 16:20:58 2008
@@ -377,7 +377,7 @@
         tracker_dbus_request_new (request_id,
 				  "DBus request to get daemon service stats");
 
-	result_set = tracker_exec_proc (db_con, "GetStats", 0);
+	result_set = tracker_exec_proc (db_con->common, "GetStats", 0);
         *values = tracker_dbus_query_result_to_ptr_array (result_set);
 
 	if (result_set) {