tracker r2468 - in branches/libtracker-data: . src/libtracker-data src/trackerd



Author: juergbi
Date: Thu Nov  6 10:49:04 2008
New Revision: 2468
URL: http://svn.gnome.org/viewvc/tracker?rev=2468&view=rev

Log:
2008-11-06  JÃrg Billeter  <j bitron ch>

	* src/libtracker-data/tracker-data-live-search.c:
	* src/libtracker-data/tracker-data-live-search.h:
	* src/trackerd/tracker-xesam-live-search.c:

	Use tracker_data_live_search as function namespace


Modified:
   branches/libtracker-data/ChangeLog
   branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c
   branches/libtracker-data/src/libtracker-data/tracker-data-live-search.h
   branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c	Thu Nov  6 10:49:04 2008
@@ -57,8 +57,8 @@
 }
 
 TrackerDBResultSet *
-tracker_db_live_search_get_hit_count (TrackerDBInterface *iface,
-				      const gchar	 *search_id)
+tracker_data_live_search_get_hit_count (TrackerDBInterface *iface,
+				        const gchar	   *search_id)
 {
 	/* SELECT count(*)
 	 * FROM LiveSearches
@@ -74,11 +74,11 @@
 }
 
 void
-tracker_db_live_search_start (TrackerDBInterface *iface,
-			      const gchar	 *from_query,
-			      const gchar	 *join_query,
-			      const gchar	 *where_query,
-			      const gchar	 *search_id)
+tracker_data_live_search_start (TrackerDBInterface *iface,
+			        const gchar	   *from_query,
+			        const gchar	   *join_query,
+			        const gchar	   *where_query,
+			        const gchar	   *search_id)
 {
 	/* INSERT
 	 * INTO LiveSearches
@@ -105,8 +105,8 @@
 }
 
 void
-tracker_db_live_search_stop (TrackerDBInterface *iface,
-			     const gchar	*search_id)
+tracker_data_live_search_stop (TrackerDBInterface *iface,
+			       const gchar	  *search_id)
 {
 	/* DELETE
 	 * FROM LiveSearches as X
@@ -122,8 +122,8 @@
 }
 
 TrackerDBResultSet *
-tracker_db_live_search_get_all_ids (TrackerDBInterface *iface,
-				    const gchar        *search_id)
+tracker_data_live_search_get_all_ids (TrackerDBInterface *iface,
+				      const gchar        *search_id)
 {
 	/* Contract, in @result:
 	 * ServiceID is #1 */
@@ -144,11 +144,11 @@
 }
 
 TrackerDBResultSet *
-tracker_db_live_search_get_new_ids (TrackerDBInterface *iface,
-				    const gchar        *search_id,
-				    const gchar        *from_query,
-				    const gchar        *query_joins,
-				    const gchar        *where_query)
+tracker_data_live_search_get_new_ids (TrackerDBInterface *iface,
+				      const gchar        *search_id,
+				      const gchar        *from_query,
+				      const gchar        *query_joins,
+				      const gchar        *where_query)
 {
 	TrackerDBResultSet *result_set;
 
@@ -237,8 +237,8 @@
 }
 
 TrackerDBResultSet*
-tracker_db_live_search_get_deleted_ids (TrackerDBInterface *iface,
-					const gchar	   *search_id)
+tracker_data_live_search_get_deleted_ids (TrackerDBInterface *iface,
+					  const gchar	     *search_id)
 {
 	/* SELECT E.ServiceID
 	 * FROM Events as E, LiveSearches as X
@@ -347,9 +347,9 @@
 
 
 TrackerDBResultSet *
-tracker_db_live_search_get_hit_data (TrackerDBInterface *iface,
-				     const gchar	*search_id,
-				     GStrv		 field_names)
+tracker_data_live_search_get_hit_data (TrackerDBInterface *iface,
+				       const gchar	  *search_id,
+				       GStrv		   field_names)
 {
 	TrackerDBResultSet *result;
 	GSList		   *fields = NULL;

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-live-search.h
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-live-search.h	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-live-search.h	Thu Nov  6 10:49:04 2008
@@ -31,26 +31,26 @@
 G_BEGIN_DECLS
 
 /* Live Search API */
-void		    tracker_db_live_search_start		 (TrackerDBInterface  *iface,
+void		    tracker_data_live_search_start		 (TrackerDBInterface  *iface,
 								  const gchar	      *from_query,
 								  const gchar	      *join_query,
 								  const gchar	      *where_query,
 								  const gchar	      *search_id);
-void		    tracker_db_live_search_stop			 (TrackerDBInterface  *iface,
+void		    tracker_data_live_search_stop		 (TrackerDBInterface  *iface,
 								  const gchar	      *search_id);
-TrackerDBResultSet *tracker_db_live_search_get_all_ids		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_live_search_get_all_ids	 (TrackerDBInterface  *iface,
 								  const gchar	      *search_id);
-TrackerDBResultSet *tracker_db_live_search_get_new_ids		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_live_search_get_new_ids	 (TrackerDBInterface  *iface,
 								  const gchar	      *search_id,
 								  const gchar	      *from_query,
 								  const gchar	      *query_joins,
 								  const gchar	      *where_query);
-TrackerDBResultSet *tracker_db_live_search_get_deleted_ids	 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_live_search_get_deleted_ids	 (TrackerDBInterface  *iface,
 								  const gchar	      *search_id);
-TrackerDBResultSet *tracker_db_live_search_get_hit_data		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_live_search_get_hit_data	 (TrackerDBInterface  *iface,
 								  const gchar	      *search_id,
 								  GStrv		       fields);
-TrackerDBResultSet *tracker_db_live_search_get_hit_count	 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_live_search_get_hit_count	 (TrackerDBInterface  *iface,
 								  const gchar	      *search_id);
 
 G_END_DECLS

Modified: branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c	Thu Nov  6 10:49:04 2008
@@ -285,7 +285,7 @@
 	/* Right now we are ignoring flags (both creates and updates are
 	 * searched) */
 
-	result_set = tracker_db_live_search_get_new_ids (iface,
+	result_set = tracker_data_live_search_get_new_ids (iface,
 							 tracker_xesam_live_search_get_id (self),
 							 tracker_xesam_live_search_get_from_query (self),
 							 tracker_xesam_live_search_get_join_query (self),
@@ -354,7 +354,7 @@
 
 	*hits = NULL;
 
-	result_set = tracker_db_live_search_get_all_ids (iface,
+	result_set = tracker_data_live_search_get_all_ids (iface,
 							 tracker_xesam_live_search_get_id (self));
 
 	if (!result_set) {
@@ -416,7 +416,7 @@
 
 	if (flags & MATCH_WITH_EVENTS_DELETES) {
 		/* Deleted items */
-		result_set = tracker_db_live_search_get_deleted_ids (iface,
+		result_set = tracker_data_live_search_get_deleted_ids (iface,
 								     tracker_xesam_live_search_get_id (self));
 
 		if (result_set) {
@@ -486,7 +486,7 @@
 		g_message ("Closing search '%s'",
 			   tracker_xesam_live_search_get_id (self));
 
-		tracker_db_live_search_stop (iface,
+		tracker_data_live_search_stop (iface,
 					     tracker_xesam_live_search_get_id (self));
 	}
 
@@ -529,7 +529,7 @@
 
 		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
-		result_set = tracker_db_live_search_get_hit_count (iface,
+		result_set = tracker_data_live_search_get_hit_count (iface,
 								   tracker_xesam_live_search_get_id (self));
 		_tracker_db_result_set_get_value (result_set, 0, &value);
 		*count = g_value_get_int (&value);
@@ -871,7 +871,7 @@
 
 			/* For ottela: fetch results for get_hits */
 
-			result_set = tracker_db_live_search_get_hit_data (iface,
+			result_set = tracker_data_live_search_get_hit_data (iface,
 									  tracker_xesam_live_search_get_id (self),
 									  fields);
 
@@ -936,7 +936,7 @@
 
 			fields = g_value_get_boxed (value);
 
-			result_set = tracker_db_live_search_get_hit_data (iface,
+			result_set = tracker_data_live_search_get_hit_data (iface,
 									  tracker_xesam_live_search_get_id (self),
 									  fields);
 
@@ -1011,7 +1011,7 @@
 
 		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
-		result_set = tracker_db_live_search_get_hit_data (iface,
+		result_set = tracker_data_live_search_get_hit_data (iface,
 								  tracker_xesam_live_search_get_id (self),
 								  fields);
 
@@ -1056,7 +1056,7 @@
 
 		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
-		result_set = tracker_db_live_search_get_hit_data (iface,
+		result_set = tracker_data_live_search_get_hit_data (iface,
 								  tracker_xesam_live_search_get_id (self),
 								  fields);
 
@@ -1118,7 +1118,7 @@
 
 		iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
 
-		tracker_db_live_search_start (iface,
+		tracker_data_live_search_start (iface,
 					      tracker_xesam_live_search_get_from_query (self),
 					      tracker_xesam_live_search_get_join_query (self),
 					      tracker_xesam_live_search_get_where_query (self),



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