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

[juergbi svn gnome org]

Author: juergbi
Date: Wed Nov  5 14:33:45 2008
New Revision: 2457
URL: http://svn.gnome.org/viewvc/tracker?rev=2457&view=rev

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

	* src/libtracker-data/tracker-data-search.c:
	* src/libtracker-data/tracker-data-search.h:
	* src/trackerd/tracker-files.c:
	* src/trackerd/tracker-keywords.c:
	* src/trackerd/tracker-search.c:

	Use tracker_data_search as function namespace


Modified:
   branches/libtracker-data/ChangeLog
   branches/libtracker-data/src/libtracker-data/tracker-data-search.c
   branches/libtracker-data/src/libtracker-data/tracker-data-search.h
   branches/libtracker-data/src/trackerd/tracker-files.c
   branches/libtracker-data/src/trackerd/tracker-keywords.c
   branches/libtracker-data/src/trackerd/tracker-search.c

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-search.c
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-search.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-search.c	Wed Nov  5 14:33:45 2008
@@ -38,13 +38,13 @@
 #include "tracker-query-tree.h"
 
 TrackerDBResultSet *
-tracker_db_search_text (TrackerDBInterface *iface,
-			const gchar	   *service,
-			const gchar	   *search_string,
-			gint		    offset,
-			gint		    limit,
-			gboolean	    save_results,
-			gboolean	    detailed)
+tracker_data_search_text (TrackerDBInterface *iface,
+			  const gchar	     *service,
+			  const gchar	     *search_string,
+			  gint		      offset,
+			  gint		      limit,
+			  gboolean	      save_results,
+			  gboolean	      detailed)
 {
 	TrackerQueryTree    *tree;
 	TrackerDBResultSet  *result_set, *result;
@@ -203,9 +203,9 @@
 }
 
 TrackerDBResultSet *
-tracker_db_search_text_and_mime (TrackerDBInterface  *iface,
-				 const gchar	     *text,
-				 gchar		    **mime_array)
+tracker_data_search_text_and_mime (TrackerDBInterface  *iface,
+				   const gchar	       *text,
+				   gchar	      **mime_array)
 {
 	TrackerQueryTree   *tree;
 	TrackerDBResultSet *result_set1;
@@ -295,9 +295,9 @@
 }
 
 TrackerDBResultSet *
-tracker_db_search_text_and_location (TrackerDBInterface *iface,
-				     const gchar	*text,
-				     const gchar	*location)
+tracker_data_search_text_and_location (TrackerDBInterface *iface,
+				       const gchar	  *text,
+				       const gchar	  *location)
 {
 	TrackerDBResultSet *result_set1;
 	TrackerQueryTree   *tree;
@@ -390,10 +390,10 @@
 }
 
 TrackerDBResultSet *
-tracker_db_search_text_and_mime_and_location (TrackerDBInterface  *iface,
-					      const gchar	  *text,
-					      gchar		 **mime_array,
-					      const gchar	  *location)
+tracker_data_search_text_and_mime_and_location (TrackerDBInterface  *iface,
+						const gchar	    *text,
+						gchar		   **mime_array,
+						const gchar	    *location)
 {
 	TrackerDBResultSet *result_set1;
 	TrackerQueryTree   *tree;
@@ -492,8 +492,8 @@
 }
 
 gchar **
-tracker_db_files_get (TrackerDBInterface *iface,
-		      const gchar	 *uri)
+tracker_data_search_files_get (TrackerDBInterface *iface,
+			       const gchar	  *uri)
 {
 	TrackerDBResultSet *result_set;
 	GPtrArray	   *array;
@@ -533,10 +533,10 @@
 }
 
 TrackerDBResultSet *
-tracker_db_files_get_by_service (TrackerDBInterface *iface,
-				 const gchar	    *service,
-				 gint		     offset,
-				 gint		     limit)
+tracker_data_search_files_get_by_service (TrackerDBInterface *iface,
+					  const gchar	     *service,
+					  gint		      offset,
+					  gint		      limit)
 {
 	TrackerDBResultSet *result_set;
 	gchar		   *str_limit;
@@ -563,12 +563,12 @@
 }
 
 TrackerDBResultSet *
-tracker_db_files_get_by_mime (TrackerDBInterface  *iface,
-			      gchar		 **mimes,
-			      gint		   n,
-			      gint		   offset,
-			      gint		   limit,
-			      gboolean		   vfs)
+tracker_data_search_files_get_by_mime (TrackerDBInterface  *iface,
+				       gchar		  **mimes,
+				       gint		    n,
+				       gint		    offset,
+				       gint		    limit,
+				       gboolean		    vfs)
 {
 	TrackerDBResultSet *result_set;
 	gint		    i;
@@ -609,8 +609,8 @@
 }
 
 TrackerDBResultSet *
-tracker_db_keywords_get_list (TrackerDBInterface *iface,
-			      const gchar	 *service)
+tracker_data_search_keywords_get_list (TrackerDBInterface *iface,
+				       const gchar	  *service)
 {
 	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
 	g_return_val_if_fail (service != NULL, NULL);

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-search.h
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-search.h	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-search.h	Wed Nov  5 14:33:45 2008
@@ -38,32 +38,32 @@
 G_BEGIN_DECLS
 
 /* Search API */
-TrackerDBResultSet *tracker_db_search_text			 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_text			 (TrackerDBInterface  *iface,
 								  const gchar	      *service,
 								  const gchar	      *search_string,
 								  gint		       offset,
 								  gint		       limit,
 								  gboolean	       save_results,
 								  gboolean	       detailed);
-TrackerDBResultSet *tracker_db_search_text_and_mime		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_text_and_mime		 (TrackerDBInterface  *iface,
 								  const gchar	      *text,
 								  gchar		     **mime_array);
-TrackerDBResultSet *tracker_db_search_text_and_location		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_text_and_location	 (TrackerDBInterface  *iface,
 								  const gchar	      *text,
 								  const gchar	      *location);
-TrackerDBResultSet *tracker_db_search_text_and_mime_and_location (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_text_and_mime_and_location (TrackerDBInterface  *iface,
 								  const gchar	      *text,
 								  gchar		     **mime_array,
 								  const gchar	      *location);
 
 /* Files API */
-gchar **	    tracker_db_files_get			 (TrackerDBInterface  *iface,
+gchar **	    tracker_data_search_files_get		 (TrackerDBInterface  *iface,
 								  const gchar	      *folder_uri);
-TrackerDBResultSet *tracker_db_files_get_by_service		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_files_get_by_service	 (TrackerDBInterface  *iface,
 								  const gchar	      *service,
 								  gint		       offset,
 								  gint		       limit);
-TrackerDBResultSet *tracker_db_files_get_by_mime		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_files_get_by_mime	 (TrackerDBInterface  *iface,
 								  gchar		     **mimes,
 								  gint		       n,
 								  gint		       offset,
@@ -71,7 +71,7 @@
 								  gboolean	       vfs);
 
 /* Keywords API */
-TrackerDBResultSet *tracker_db_keywords_get_list		 (TrackerDBInterface  *iface,
+TrackerDBResultSet *tracker_data_search_keywords_get_list	 (TrackerDBInterface  *iface,
 								  const gchar	      *service);
 
 G_END_DECLS

Modified: branches/libtracker-data/src/trackerd/tracker-files.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-files.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-files.c	Wed Nov  5 14:33:45 2008
@@ -528,7 +528,7 @@
 
 	iface = tracker_db_manager_get_db_interface_by_service (service); 
 
-	result_set = tracker_db_files_get_by_service (iface,
+	result_set = tracker_data_search_files_get_by_service (iface,
 						      service,
 						      offset,
 						      max_hits);
@@ -578,7 +578,7 @@
 
 	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
 
-	result_set = tracker_db_files_get_by_mime (iface,
+	result_set = tracker_data_search_files_get_by_mime (iface,
 						   mime_types,
 						   g_strv_length (mime_types),
 						   offset,
@@ -633,7 +633,7 @@
 	/* NOTE: The only difference between this function and the
 	 * non-VFS version is the boolean in this function call:
 	 */
-	result_set = tracker_db_files_get_by_mime (iface,
+	result_set = tracker_data_search_files_get_by_mime (iface,
 						   mime_types,
 						   g_strv_length (mime_types),
 						   offset,
@@ -880,7 +880,7 @@
 
 	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);
+	result_set = tracker_data_search_text_and_mime (iface, text, mime_types);
 
 	if (result_set) {
 		gboolean  valid = TRUE;
@@ -942,7 +942,7 @@
 
 	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);
+	result_set = tracker_data_search_text_and_location (iface, text, uri);
 
 	if (result_set) {
 		gboolean  valid = TRUE;
@@ -1008,7 +1008,7 @@
 
 	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);
+	result_set = tracker_data_search_text_and_mime_and_location (iface, text, mime_types, uri);
 
 	if (result_set) {
 		gboolean  valid = TRUE;

Modified: branches/libtracker-data/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-keywords.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-keywords.c	Wed Nov  5 14:33:45 2008
@@ -144,7 +144,7 @@
 	}
 
 	iface = tracker_db_manager_get_db_interface_by_service (service_type);
-	result_set = tracker_db_keywords_get_list (iface, service_type);
+	result_set = tracker_data_search_keywords_get_list (iface, service_type);
 	values = tracker_dbus_query_result_to_ptr_array (result_set);
 
 	if (result_set) {

Modified: branches/libtracker-data/src/trackerd/tracker-search.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-search.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-search.c	Wed Nov  5 14:33:45 2008
@@ -36,10 +36,12 @@
 #include <libtracker-db/tracker-db-manager.h>
 
 #include <libtracker-data/tracker-data-manager.h>
+#include <libtracker-data/tracker-data-search.h>
+#include <libtracker-data/tracker-query-tree.h>
+#include <libtracker-data/tracker-rdf-query.h>
+
 #include "tracker-dbus.h"
 #include "tracker-search.h"
-#include <libtracker-data/tracker-rdf-query.h>
-#include <libtracker-data/tracker-query-tree.h>
 #include "tracker-marshal.h"
 
 #define TRACKER_SEARCH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_SEARCH, TrackerSearchPrivate))
@@ -610,7 +612,7 @@
 
 	iface = tracker_db_manager_get_db_interface_by_service (service);
 
-	result_set = tracker_db_search_text (iface,
+	result_set = tracker_data_search_text (iface,
 					     service,
 					     search_text,
 					     offset,
@@ -714,7 +716,7 @@
 
 	iface = tracker_db_manager_get_db_interface_by_service (service);
 
-	result_set = tracker_db_search_text (iface,
+	result_set = tracker_data_search_text (iface,
 					     service,
 					     search_text,
 					     offset,
@@ -1147,7 +1149,7 @@
 					      query_translated);
 
 		if (!tracker_is_empty_string (search_text)) {
-			tracker_db_search_text (iface,
+			tracker_data_search_text (iface,
 						service,
 						search_text,
 						0,