GNOME.org
 

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

Author: pvanhoof
Date: Wed Jul  2 09:41:36 2008
New Revision: 1818
URL: http://svn.gnome.org/viewvc/tracker?rev=1818&view=rev

Log:
2008-07-02  Philip Van Hoof  <pvanhoof gnome org>

        * src/trackerd/tracker-search.c:
        * src/trackerd/tracker-files.c:
        * src/trackerd/tracker-xesam-live-search.c:
        * src/trackerd/tracker-xesam-manager.c:
        * src/libtracker-db/tracker-db-manager.h:

        Replaced a few strings with defines



Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-manager.h
   branches/indexer-split/src/trackerd/tracker-files.c
   branches/indexer-split/src/trackerd/tracker-search.c
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
   branches/indexer-split/src/trackerd/tracker-xesam-manager.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.h	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.h	Wed Jul  2 09:41:36 2008
@@ -44,6 +44,9 @@
 	TRACKER_DB_MANAGER_REMOVE_CACHE  = 1 << 2,
 } TrackerDBManagerFlags;
 
+#define TRACKER_DB_FOR_FILE_SERVICE	"Files"
+#define TRACKER_DB_FOR_EMAIL_SERVICE	"Emails"
+#define TRACKER_DB_FOR_XESAM_SERVICE	"Xesam"
 
 GType        tracker_db_get_type                            (void) G_GNUC_CONST;
 

Modified: branches/indexer-split/src/trackerd/tracker-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-files.c	Wed Jul  2 09:41:36 2008
@@ -81,7 +81,7 @@
                                   "uri:'%s'",
 				  uri);
 	
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	file_id = tracker_db_file_get_id (iface, uri);
 	exists = file_id > 0;
@@ -148,7 +148,7 @@
                                   size,
                                   mtime);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	/* Create structure */
 	info = tracker_db_file_info_new (uri, 1, 0, 0);
@@ -257,7 +257,7 @@
                                   "uri:'%s'",
                                   uri);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	file_id = tracker_db_file_get_id (iface, uri);
 	if (file_id == 0) {
@@ -336,7 +336,7 @@
                                   "uri:'%s'",
                                   uri);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	file_id = tracker_db_file_get_id (iface, uri);
 
@@ -420,7 +420,7 @@
                                   offset,
                                   max_length);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	service_id = tracker_db_file_get_id_as_string (iface, "Files", uri);
 	if (!service_id) {
@@ -497,7 +497,7 @@
                                   text,
                                   max_length);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	if (uri[0] == G_DIR_SEPARATOR) {
 		name = g_path_get_basename (uri);
@@ -568,7 +568,7 @@
                                   offset,
                                   max_hits);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	if (!tracker_ontology_is_valid_service_type (service)) {
 		tracker_dbus_request_failed (request_id,
@@ -623,7 +623,7 @@
                                   offset,
                                   max_hits);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	result_set = tracker_db_files_get_by_mime (iface,
 						   mime_types, 
@@ -672,7 +672,7 @@
                                   offset,
                                   max_hits);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	/* NOTE: The only difference between this function and the
 	 * non-VFS version is the boolean in this function call:
@@ -717,7 +717,7 @@
                                   "uri:'%s'",
                                   uri);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	if (uri[0] == G_DIR_SEPARATOR) {
 		name = g_path_get_basename (uri);
@@ -784,7 +784,7 @@
                                   uri,
                                   g_strv_length (fields));
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	/* Get fields for metadata list provided */
 	for (i = 0; i < g_strv_length (fields); i++) {
@@ -912,7 +912,7 @@
                                   text,
                                   g_strv_length (mime_types));
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	result_set = tracker_db_search_text_and_mime (iface, text, mime_types);
 
@@ -972,7 +972,7 @@
                                   text,
                                   uri);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	result_set = tracker_db_search_text_and_location (iface, text, uri);
 
@@ -1036,7 +1036,7 @@
 				  g_strv_length (mime_types),
                                   uri);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Files");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
 	result_set = tracker_db_search_text_and_mime_and_location (iface, text, mime_types, uri);
 

Modified: branches/indexer-split/src/trackerd/tracker-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-search.c	Wed Jul  2 09:41:36 2008
@@ -1010,7 +1010,7 @@
                                   max_hits,
                                   group_results ? "yes" : "no");
 
-	/* iface = tracker_db_manager_get_db_interface_by_service ("Files"); */
+	/* iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE); */
 
 	/* FIXME: This function no longer exists, it was returning
 	 * NULL in every case, this DBus function needs rewriting or

Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	Wed Jul  2 09:41:36 2008
@@ -406,7 +406,7 @@
 	g_return_if_fail (removed != NULL);
 	g_return_if_fail (modified != NULL);
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 	*added = NULL;
 	*removed = NULL;
@@ -479,7 +479,7 @@
 	} else {
 		TrackerDBInterface *iface;
 
-		iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 		g_message ("Closing search '%s'", 
 			   tracker_xesam_live_search_get_id (self));
@@ -525,7 +525,7 @@
 		TrackerDBResultSet *result_set;
 		GValue              value = {0, };
 
-		iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 		result_set = tracker_db_live_search_get_hit_count (iface, 
 								   tracker_xesam_live_search_get_id (self));
@@ -865,7 +865,7 @@
 
 			fields = g_value_get_boxed (value);
 
-			iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+			iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 			/* For ottela: fetch results for get_hits */
 
@@ -917,7 +917,7 @@
 		GValue              *value;
 		GError              *tmp_error = NULL;
 
-		iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 		tracker_xesam_session_get_property (session, 
 						    "hit.fields", 
@@ -1007,7 +1007,7 @@
 		TrackerDBInterface *iface;
 		TrackerDBResultSet *result_set;
 
-		iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 		result_set = tracker_db_live_search_get_hit_data (iface,
 								  tracker_xesam_live_search_get_id (self),
@@ -1052,7 +1052,7 @@
 		TrackerDBInterface *iface;
 		TrackerDBResultSet *result_set;
 
-		iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 		result_set = tracker_db_live_search_get_hit_data (iface,
 								  tracker_xesam_live_search_get_id (self),
@@ -1114,7 +1114,7 @@
 		TrackerDBInterface *iface;
 		GArray             *hits;
 
-		iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 		tracker_db_live_search_start (iface,
 					      tracker_xesam_live_search_get_from_query (self),
@@ -1234,7 +1234,7 @@
 
 	priv = self->priv;
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 	xesam = tracker_dbus_get_object (TRACKER_TYPE_XESAM);
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-manager.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-manager.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-manager.c	Wed Jul  2 09:41:36 2008
@@ -263,7 +263,7 @@
 	GList              *sessions;
 	gboolean            reason_to_live = FALSE;
 
-	iface = tracker_db_manager_get_db_interface_by_service ("Xesam");
+	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
 	g_return_val_if_fail (iface != NULL, FALSE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]