tracker r1418 - in branches/xesam-support: . data src/libtracker-common src/tracker-indexer src/tracker-indexer/modules src/trackerd



Author: pvanhoof
Date: Wed May 14 09:14:06 2008
New Revision: 1418
URL: http://svn.gnome.org/viewvc/tracker?rev=1418&view=rev

Log:
2008-05-14  Philip Van Hoof  <pvanhoof gnome org>

        * Merged with indexer-split (rev 1417)
        -> svn merge -r 1409:1417 ../indexer-split



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/data/Makefile.am
   branches/xesam-support/src/libtracker-common/tracker-config.c
   branches/xesam-support/src/tracker-indexer/modules/files.c
   branches/xesam-support/src/tracker-indexer/tracker-indexer.c
   branches/xesam-support/src/trackerd/tracker-db-sqlite.c
   branches/xesam-support/src/trackerd/tracker-db-sqlite.h

Modified: branches/xesam-support/data/Makefile.am
==============================================================================
--- branches/xesam-support/data/Makefile.am	(original)
+++ branches/xesam-support/data/Makefile.am	Wed May 14 09:14:06 2008
@@ -11,6 +11,7 @@
 	tracker-dbus-xesam.xml			\
 	sqlite-tracker.sql 			\
 	sqlite-cache.sql 			\
+	sqlite-contents.sql			\
 	sqlite-email.sql			\
 	sqlite-service-stored-procs.sql 	\
 	sqlite-service-triggers.sql 		\

Modified: branches/xesam-support/src/libtracker-common/tracker-config.c
==============================================================================
--- branches/xesam-support/src/libtracker-common/tracker-config.c	(original)
+++ branches/xesam-support/src/libtracker-common/tracker-config.c	Wed May 14 09:14:06 2008
@@ -559,6 +559,24 @@
 
 	priv = GET_PRIV (object);
 
+	g_slist_foreach (priv->watch_directory_roots, (GFunc) g_free, NULL);
+	g_slist_free (priv->watch_directory_roots);
+
+	g_slist_foreach (priv->crawl_directory_roots, (GFunc) g_free, NULL);
+	g_slist_free (priv->crawl_directory_roots);
+
+	g_slist_foreach (priv->no_watch_directory_roots, (GFunc) g_free, NULL);
+	g_slist_free (priv->no_watch_directory_roots);
+
+	g_slist_foreach (priv->no_index_file_types, (GFunc) g_free, NULL);
+	g_slist_free (priv->no_index_file_types);
+
+	g_slist_foreach (priv->index_modules, (GFunc) g_free, NULL);
+	g_slist_free (priv->index_modules);
+
+	g_free (priv->language);
+	g_free (priv->email_client);
+
 	(G_OBJECT_CLASS (tracker_config_parent_class)->finalize) (object);
 }
 

Modified: branches/xesam-support/src/tracker-indexer/modules/files.c
==============================================================================
--- branches/xesam-support/src/tracker-indexer/modules/files.c	(original)
+++ branches/xesam-support/src/tracker-indexer/modules/files.c	Wed May 14 09:14:06 2008
@@ -100,7 +100,6 @@
 
 	/* FIXME, Missing:
 	 *
-	 * File:NameDelimited
 	 * File:Mime
 	 * File:Size
 	 * File:Modified

Modified: branches/xesam-support/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/xesam-support/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/xesam-support/src/tracker-indexer/tracker-indexer.c	Wed May 14 09:14:06 2008
@@ -123,9 +123,6 @@
 	g_queue_foreach (priv->file_process_queue, (GFunc) path_info_free, NULL);
 	g_queue_free (priv->file_process_queue);
 
-	g_slist_foreach (priv->module_names, (GFunc) g_free, NULL);
-	g_slist_free (priv->module_names);
-
 	g_hash_table_destroy (priv->indexer_modules);
 
 	g_object_unref (priv->config);

Modified: branches/xesam-support/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-db-sqlite.c	Wed May 14 09:14:06 2008
@@ -399,7 +399,7 @@
 }
 
 static void
-load_generic_sql_file (DBConnection *db_con, const gchar *sql_file, const gchar *delimiter) { 
+load_generic_sql_file (TrackerDBInterface *iface, const gchar *sql_file, const gchar *delimiter) { 
 
 	char *filename, *query;
 	
@@ -414,7 +414,7 @@
 		queries = g_strsplit_set (query, delimiter, -1);
 
 		for (queries_p = queries; *queries_p; queries_p++) {
-			tracker_db_exec_no_reply (db_con->db, *queries_p);
+			tracker_db_exec_no_reply (iface, *queries_p);
 		}
 		g_strfreev (queries);
 		g_free (query);
@@ -425,19 +425,19 @@
 }
 
 static void
-load_sql_file (DBConnection *db_con, const char *sql_file)
+load_sql_file (TrackerDBInterface *iface, const char *sql_file)
 {
-	load_generic_sql_file (db_con, sql_file, ";");
+	load_generic_sql_file (iface, sql_file, ";");
 }
 
 static void
-load_sql_trigger (DBConnection *db_con, const char *sql_file)
+load_sql_trigger (TrackerDBInterface *iface, const char *sql_file)
 {
-	load_generic_sql_file (db_con, sql_file, "!");
+	load_generic_sql_file (iface, sql_file, "!");
 }
 
 static void
-load_service_file (DBConnection *db_con, const gchar *filename) 
+load_service_file (TrackerDBInterface *iface, const gchar *filename) 
 {
 	GKeyFile 		*key_file = NULL;
 	const gchar * const 	*locale_array;
@@ -468,8 +468,8 @@
 		service = tracker_service_manager_get_service (*group);
 
 		if (!service) {
-			tracker_exec_proc (db_con, "InsertServiceType", *group, NULL);
-			id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (db_con->db));
+			tracker_db_exec_proc (iface, "InsertServiceType", *group, NULL);
+			id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
 		} else {
 			id = tracker_service_get_id (service);
 		}
@@ -497,7 +497,7 @@
 				char **tmp;
 				for (tmp = tab_array; *tmp; tmp++) { 			
 
-					tracker_exec_proc (db_con, "InsertServiceTabularMetadata", str_id, *tmp, NULL);
+					tracker_db_exec_proc (iface, "InsertServiceTabularMetadata", str_id, *tmp, NULL);
 								
 				}
 
@@ -512,7 +512,7 @@
 				char **tmp;
 				for (tmp = tab_array; *tmp; tmp++) { 			
 
-					tracker_exec_proc (db_con, "InsertServiceTileMetadata", str_id, *tmp, NULL);
+					tracker_db_exec_proc (iface, "InsertServiceTileMetadata", str_id, *tmp, NULL);
 				}
 
 				g_strfreev (tab_array);
@@ -523,9 +523,9 @@
 
 				char **tmp;
 				for (tmp = tab_array; *tmp; tmp++) { 			
-					tracker_exec_proc (db_con, "InsertMimes", *tmp, NULL);
+					tracker_db_exec_proc (iface, "InsertMimes", *tmp, NULL);
 							
-					tracker_db_exec_no_reply (db_con->db,
+					tracker_db_exec_no_reply (iface,
 								  "update FileMimes set ServiceTypeID = %s where Mime = '%s'",
 								  str_id, *tmp);
 				}
@@ -538,9 +538,9 @@
 
 				char **tmp;
 				for (tmp = tab_array; *tmp; tmp++) { 			
-					tracker_exec_proc (db_con, "InsertMimePrefixes", *tmp, NULL);
+					tracker_db_exec_proc (iface, "InsertMimePrefixes", *tmp, NULL);
 
-					tracker_db_exec_no_reply (db_con->db,
+					tracker_db_exec_no_reply (iface,
 								  "update FileMimePrefixes set ServiceTypeID = %s where MimePrefix = '%s'",
 								  str_id, *tmp);
 				}
@@ -551,7 +551,7 @@
 			} else {
 				char *esc_value = tracker_escape_string (new_value);
 
-				tracker_db_exec_no_reply (db_con->db,
+				tracker_db_exec_no_reply (iface,
 							  "update ServiceTypes set  %s = '%s' where TypeID = %s",
 							  *key, esc_value, str_id);
 				g_free (esc_value);
@@ -568,7 +568,7 @@
 }
 
 static void
-load_metadata_file (DBConnection *db_con, const gchar *filename) 
+load_metadata_file (TrackerDBInterface *iface, const gchar *filename) 
 {
 	GKeyFile 		*key_file = NULL;
 	const gchar * const 	*locale_array;
@@ -601,8 +601,8 @@
 		def = tracker_db_get_field_def (*group);
 
 		if (!def) {
-			tracker_exec_proc (db_con, "InsertMetadataType", *group, NULL);
-			id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (db_con->db));
+			tracker_db_exec_proc (iface, "InsertMetadataType", *group, NULL);
+			id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
 		} else {
 			id = atoi (def->id);
 		}
@@ -624,15 +624,15 @@
 
 
 			if (strcasecmp (*key, "Parent") == 0) {
-
-				tracker_exec_proc (db_con, "InsertMetaDataChildren", str_id, new_value, NULL);
+				
+				tracker_db_exec_proc (iface, "InsertMetaDataChildren", str_id, new_value, NULL);
 				
 			} else if (strcasecmp (*key, "DataType") == 0) {
 				
 				int data_id = tracker_string_in_string_list (new_value, DataTypeArray);
 				
 				if (data_id != -1) {
-					tracker_db_exec_no_reply (db_con->db,
+					tracker_db_exec_no_reply (iface,
 								  "update MetaDataTypes set DataTypeID = %d where ID = %s",
 								  data_id, str_id);
 				}
@@ -641,7 +641,7 @@
 			} else {
 				char *esc_value = tracker_escape_string (new_value);
 				
-				tracker_db_exec_no_reply (db_con->db,
+				tracker_db_exec_no_reply (iface,
 							  "update MetaDataTypes set  %s = '%s' where ID = %s",
 							  *key, esc_value, str_id);
 				g_free (esc_value);
@@ -656,7 +656,7 @@
 }
 
 static void
-load_extractor_file (DBConnection *db_con, const gchar *filename)
+load_extractor_file (TrackerDBInterface *iface, const gchar *filename)
 {
 	GKeyFile 		*key_file = NULL;
 	const gchar * const 	*locale_array;
@@ -710,17 +710,17 @@
 }
 
 static gboolean
-load_service_description_file (DBConnection *db_con, const gchar* filename)
+load_service_description_file (TrackerDBInterface *iface, const gchar* filename)
 {
 
 	if (g_str_has_suffix (filename, ".metadata")) {
-		load_metadata_file (db_con, filename);
+		load_metadata_file (iface, filename);
 
 	} else if (g_str_has_suffix (filename, ".service")) {
-		load_service_file (db_con, filename);
+		load_service_file (iface, filename);
 
 	} else if (g_str_has_suffix (filename, ".extractor")) {
-		load_extractor_file (db_con, filename);
+		load_extractor_file (iface, filename);
 
 	} else {
 		return FALSE;
@@ -937,13 +937,6 @@
 }
 
 
-static void
-open_common_db (DBConnection *db_con)
-{
-	db_con->db = open_db_interface (TRACKER_DB_COMMON);
-}
-
-
 DBConnection *
 tracker_db_connect_common (void)
 {
@@ -952,7 +945,7 @@
 
 	db_con = g_new0 (DBConnection, 1);
 
-	open_common_db (db_con);
+	db_con->db = open_db_interface (TRACKER_DB_COMMON);
 
 	db_con->cache = NULL;
 	db_con->emails = NULL;
@@ -1129,26 +1122,26 @@
 
 	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);
+	db_con = tracker_db_connect_file_meta ();
+
 	db_con->data = db_con;
 	
 	if (create_table) {
 		tracker_log ("Creating file database... %s",
 			     tracker_db_manager_get_file (TRACKER_DB_FILE_META));
-		load_sql_file (db_con, "sqlite-service.sql");
-		load_sql_trigger (db_con, "sqlite-service-triggers.sql");
+		load_sql_file (db_con->db, "sqlite-service.sql");
+		load_sql_trigger (db_con->db, "sqlite-service-triggers.sql");
 
-		load_sql_file (db_con, "sqlite-metadata.sql");
+		load_sql_file (db_con->db, "sqlite-metadata.sql");
 	
-		load_service_description_file (db_con, "default.metadata");
-		load_service_description_file (db_con, "file.metadata");
-		load_service_description_file (db_con, "audio.metadata");
-		load_service_description_file (db_con, "application.metadata");
-		load_service_description_file (db_con, "document.metadata");
-		load_service_description_file (db_con, "email.metadata");
-		load_service_description_file (db_con, "image.metadata");	
-		load_service_description_file (db_con, "video.metadata");	
+		load_service_description_file (db_con->db, "default.metadata");
+		load_service_description_file (db_con->db, "file.metadata");
+		load_service_description_file (db_con->db, "audio.metadata");
+		load_service_description_file (db_con->db, "application.metadata");
+		load_service_description_file (db_con->db, "document.metadata");
+		load_service_description_file (db_con->db, "email.metadata");
+		load_service_description_file (db_con->db, "image.metadata");	
+		load_service_description_file (db_con->db, "video.metadata");	
 
 		load_sql_file (db_con, "sqlite-xesam.sql");
 
@@ -1168,7 +1161,7 @@
 	// TODO: move tables Events and XesamLiveSearches from sqlite-service.sql
 	// to TEMPORARY tables in sqlite-temp-tables.sql:
 
-	// load_sql_file (db_con, "sqlite-temp-tables.sql");
+	// load_sql_file (db_con->db, "sqlite-temp-tables.sql");
 
 	tracker_db_attach_db (db_con, TRACKER_DB_COMMON);
 	tracker_db_attach_db (db_con, TRACKER_DB_CACHE);
@@ -1195,7 +1188,7 @@
 
 	db_con = g_new0 (DBConnection, 1);
 
-	open_file_db (db_con);
+	db_con->db = open_db_interface (TRACKER_DB_FILE_META);
 
 	return db_con;
 }
@@ -1232,7 +1225,7 @@
 	db_con->db = open_db_interface (TRACKER_DB_FILE_CONTENTS);
 
 	if (create) {
-		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))");
+		load_sql_file (db_con->db, "sqlite-contents.sql");
 		tracker_log ("Creating db: %s",
 			     tracker_db_manager_get_file (TRACKER_DB_FILE_CONTENTS));
 	}
@@ -1265,7 +1258,7 @@
 	db_con->db = open_db_interface (TRACKER_DB_EMAIL_CONTENTS);
 
 	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))");
+		load_sql_file (db_con->db, "sqlite-contents.sql");
 		tracker_log ("Creating db: %s",
 			     tracker_db_manager_get_file (TRACKER_DB_EMAIL_CONTENTS));
 	}
@@ -1311,7 +1304,9 @@
 	open_file_content_db (db_con->blob);
 
 	open_email_content_db (emails->blob);
-	open_common_db (emails->common);
+
+	emails->common->db = open_db_interface (TRACKER_DB_COMMON);
+
 	open_email_db (emails);
 		
 	if (cache_trans) {
@@ -1340,7 +1335,9 @@
 	tracker_db_close (emails->db);
 
 	open_email_content_db (emails->blob);
-	open_common_db (emails->common);
+
+	emails->common->db = open_db_interface (TRACKER_DB_COMMON);
+
 	open_email_db (emails);
 
 	if (cache_trans) {
@@ -1367,7 +1364,7 @@
 	 */
 
 	if (create_table) {
-		load_sql_file (db_con, "sqlite-cache.sql");
+		load_sql_file (db_con->db, "sqlite-cache.sql");
 		tracker_db_exec_no_reply (db_con->db, "ANALYZE");
 		tracker_log ("Creating db: %s",
 			     tracker_db_manager_get_file (TRACKER_DB_CACHE));
@@ -1396,9 +1393,9 @@
 
 	if (create_table) {
 		tracker_log ("Creating email database...");
-		load_sql_file (db_con, "sqlite-service.sql");
-		load_sql_trigger (db_con, "sqlite-service-triggers.sql");
-		load_sql_file (db_con, "sqlite-email.sql");
+		load_sql_file (db_con->db, "sqlite-service.sql");
+		load_sql_trigger (db_con->db, "sqlite-service-triggers.sql");
+		load_sql_file (db_con->db, "sqlite-email.sql");
 
 		tracker_db_exec_no_reply (db_con->db, "ANALYZE");
 	}
@@ -1457,14 +1454,27 @@
 	return result_set;
 }
 
+TrackerDBResultSet *
+tracker_db_exec_proc (TrackerDBInterface *iface, const char *procedure, ...)
+{
+	TrackerDBResultSet *result_set;
+	va_list args;
 
-gboolean
-tracker_exec_proc_no_reply (DBConnection *db_con, const char *procedure, ...)
+	va_start (args, procedure);
+	result_set = tracker_db_interface_execute_vprocedure (iface, NULL, procedure, args);
+	va_end (args);
+
+	return result_set;
+}
+
+
+static gboolean
+tracker_exec_proc_no_reply (TrackerDBInterface *iface, const char *procedure, ...)
 {
 	va_list args;
 
 	va_start (args, procedure);
-	tracker_db_interface_execute_vprocedure_no_reply (db_con->db, NULL, procedure, args);
+	tracker_db_interface_execute_vprocedure_no_reply (iface, NULL, procedure, args);
 	va_end (args);
 
 	return TRUE;
@@ -1483,21 +1493,21 @@
 
 	db_con = tracker_db_connect_common ();
 	
-	load_sql_file (db_con, "sqlite-tracker.sql");
-	load_sql_file (db_con, "sqlite-service-types.sql");
-	load_sql_file (db_con, "sqlite-metadata.sql");
-	load_sql_trigger (db_con, "sqlite-tracker-triggers.sql");
-
-	load_service_description_file (db_con, "default.metadata");
-	load_service_description_file (db_con, "file.metadata");
-	load_service_description_file (db_con, "audio.metadata");
-	load_service_description_file (db_con, "application.metadata");
-	load_service_description_file (db_con, "document.metadata");
-	load_service_description_file (db_con, "email.metadata");
-	load_service_description_file (db_con, "image.metadata");	
-	load_service_description_file (db_con, "video.metadata");	
+	load_sql_file (db_con->db, "sqlite-tracker.sql");
+	load_sql_file (db_con->db, "sqlite-service-types.sql");
+	load_sql_file (db_con->db, "sqlite-metadata.sql");
+	load_sql_trigger (db_con->db, "sqlite-tracker-triggers.sql");
+
+	load_service_description_file (db_con->db, "default.metadata");
+	load_service_description_file (db_con->db, "file.metadata");
+	load_service_description_file (db_con->db, "audio.metadata");
+	load_service_description_file (db_con->db, "application.metadata");
+	load_service_description_file (db_con->db, "document.metadata");
+	load_service_description_file (db_con->db, "email.metadata");
+	load_service_description_file (db_con->db, "image.metadata");	
+	load_service_description_file (db_con->db, "video.metadata");	
 
-	load_service_description_file (db_con, "default.service");
+	load_service_description_file (db_con->db, "default.service");
 
 	load_sql_file (db_con, "sqlite-xesam.sql");
 
@@ -1551,7 +1561,7 @@
 	return !tracker_db_manager_file_exists (TRACKER_DB_COMMON);
 }
 
-gint
+static gint
 tracker_metadata_is_key (const gchar *service, const gchar *meta_name)
 {
 	return tracker_service_manager_metadata_in_service (service, meta_name);
@@ -3291,7 +3301,7 @@
 tracker_db_get_events (DBConnection *db_con)
 {
 	tracker_debug ("SetEventsBeingHandled");
-	tracker_exec_proc_no_reply (db_con->cache, "SetEventsBeingHandled", NULL);
+	tracker_exec_proc_no_reply (db_con->cache->db, "SetEventsBeingHandled", NULL);
 
 	tracker_debug ("GetEvents");
 	return tracker_exec_proc (db_con->cache, "GetEvents", NULL);
@@ -5459,32 +5469,6 @@
 
 }
 
-gboolean
-tracker_db_integrity_check (DBConnection *db_con)
-{
-	TrackerDBResultSet *result_set;
-	gboolean integrity_check = TRUE;
-
-	result_set = tracker_db_interface_execute_query (db_con->db, NULL, "pragma integrity_check;");
-
-	if (!result_set) {
-		integrity_check = FALSE;
-	} else {
-		gchar *check;
-
-		tracker_db_result_set_get (result_set, 0, &check, -1);
-
-		if (check) {
-			integrity_check = (strcasecmp (check, "ok") == 0);
-			g_free (check);
-		}
-
-		g_object_unref (result_set);
-	}
-
-	return integrity_check;
-}
-
 void
 tracker_free_metadata_field (FieldData *field_data)
 {

Modified: branches/xesam-support/src/trackerd/tracker-db-sqlite.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-db-sqlite.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-db-sqlite.h	Wed May 14 09:14:06 2008
@@ -89,13 +89,18 @@
 
 } FieldData;
 
+/* Module wide ops */
 gboolean            tracker_db_needs_setup                     (void);
 gboolean            tracker_db_common_need_build               (void);
 gboolean            tracker_db_load_prepared_queries                      (void);
 void                tracker_db_thread_init                     (void);
 void                tracker_db_thread_end                      (void);
-void                tracker_db_close                           (TrackerDBInterface   *iface);
 void                tracker_db_finalize                        (void);
+void                tracker_create_common_db                   (void);
+void                tracker_db_get_static_data                 (DBConnection   *db_con);
+
+
+/* Open, create, connect DBs */
 DBConnection *      tracker_db_connect                         (void);
 DBConnection *      tracker_db_connect_common                  (void);
 DBConnection *      tracker_db_connect_file_content            (void);
@@ -108,26 +113,49 @@
 void                tracker_db_close_all                       (DBConnection   *db_con);
 void                tracker_db_refresh_all                     (DBConnection   *db_con);
 void                tracker_db_refresh_email                   (DBConnection   *db_con);
+
+/* Operations for TrackerDBInterface */
+void                tracker_db_close                           (TrackerDBInterface   *iface);
+
 TrackerDBResultSet *tracker_exec_proc                          (DBConnection   *db_con,
                                                                 const gchar    *procedure,
                                                                 ...);
-gboolean            tracker_exec_proc_no_reply                 (DBConnection   *db_con,
-                                                                const gchar    *procedure,
-                                                                ...);
+TrackerDBResultSet *tracker_db_exec_proc                       (TrackerDBInterface   *iface,
+								const gchar    *procedure,
+								...);
+
 gboolean            tracker_db_exec_no_reply                   (TrackerDBInterface   *iface,
                                                                 const gchar          *query,
                                                                 ...);
 TrackerDBResultSet *tracker_db_exec                            (TrackerDBInterface *iface, 
                                                                 const char *query,
                                                                 ...);
-void                tracker_create_common_db                          (void);
+gboolean            tracker_db_is_in_transaction               (DBConnection   *db_con);
+
+gchar *             tracker_db_get_option_string               (DBConnection   *db_con,
+                                                                const gchar    *option);
+void                tracker_db_set_option_string               (DBConnection   *db_con,
+                                                                const gchar    *option,
+                                                                const gchar    *value);
+gint                tracker_db_get_option_int                  (DBConnection   *db_con,
+                                                                const gchar    *option);
+void                tracker_db_set_option_int                  (DBConnection   *db_con,
+                                                                const gchar    *option,
+                                                                gint            value);
+
+
+/* high level transactions things */
+void                tracker_db_start_index_transaction         (DBConnection   *db_con);
+void                tracker_db_end_index_transaction           (DBConnection   *db_con);
+gboolean            tracker_db_regulate_transactions           (DBConnection   *db_con,
+                                                                gint            interval);
+
+/* High level operations (with application logic and/or using more than one DB */
 void                tracker_db_save_file_contents              (DBConnection   *db_con,
                                                                 GHashTable     *index_table,
                                                                 GHashTable     *old_table,
                                                                 const gchar    *file_name,
                                                                 TrackerDBFileInfo *info);
-gboolean            tracker_db_start_transaction               (DBConnection   *db_con);
-gboolean            tracker_db_end_transaction                 (DBConnection   *db_con);
 void                tracker_db_update_indexes_for_new_service  (guint32         service_id,
                                                                 gint            service_type_id,
                                                                 GHashTable     *table);
@@ -303,7 +331,6 @@
                                                                 const gchar    *id,
                                                                 const gchar    *key,
                                                                 gchar         **values);
-void                tracker_db_get_static_data                 (DBConnection   *db_con);
 DBConnection *      tracker_db_get_service_connection          (DBConnection   *db_con,
                                                                 const gchar    *service);
 gchar *             tracker_db_get_service_for_entity          (DBConnection   *db_con,
@@ -318,12 +345,12 @@
                                                                 guint32         id,
                                                                 GHashTable     *table,
                                                                 gboolean        embedded_only);
-gboolean            tracker_db_has_display_metadata            (FieldDef       *def);
+
 gchar *             tracker_db_get_field_name                  (const gchar    *service,
                                                                 const gchar    *meta_name);
-gint                tracker_metadata_is_key                    (const gchar    *service,
-                                                                const gchar    *meta_name);
 gchar *             tracker_db_get_display_field               (FieldDef       *def);
+void                tracker_free_metadata_field                (FieldData *field_data);
+
 void                tracker_db_delete_service                  (DBConnection   *db_con,
                                                                 guint32         id,
                                                                 const gchar    *uri);
@@ -333,22 +360,8 @@
                                                                 gint            field_count,
                                                                 gboolean        is_select,
                                                                 gboolean        is_condition);
-gboolean            tracker_db_is_in_transaction               (DBConnection   *db_con);
-void                tracker_db_start_index_transaction         (DBConnection   *db_con);
-void                tracker_db_end_index_transaction           (DBConnection   *db_con);
-gboolean            tracker_db_regulate_transactions           (DBConnection   *db_con,
-                                                                gint            interval);
-gchar *             tracker_db_get_option_string               (DBConnection   *db_con,
-                                                                const gchar    *option);
-void                tracker_db_set_option_string               (DBConnection   *db_con,
-                                                                const gchar    *option,
-                                                                const gchar    *value);
-gint                tracker_db_get_option_int                  (DBConnection   *db_con,
-                                                                const gchar    *option);
-void                tracker_db_set_option_int                  (DBConnection   *db_con,
-                                                                const gchar    *option,
-                                                                gint            value);
-gboolean            tracker_db_integrity_check                 (DBConnection   *db_con);
+
+/* XESAM stuff */
 TrackerDBResultSet *tracker_db_get_events                      (DBConnection *db_con);
 void                tracker_db_delete_handled_events           (DBConnection   *db_con, 
                                                                 TrackerDBResultSet *events);
@@ -362,7 +375,6 @@
 TrackerDBResultSet *tracker_db_get_live_search_hit_count       (DBConnection *db_con, 
                                                                 const gchar *search_id);
 
-void                tracker_free_metadata_field                (FieldData *field_data);
 
 TrackerDBResultSet *tracker_get_xesam_metadata_names           (DBConnection *db_con, 
                                                                 const char *name);



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