[tracker] libtracker-data: Remove unused functions



commit 59dc5ab74f31eb3984ae8c723238a2bb5a6ee702
Author: Jürg Billeter <j bitron ch>
Date:   Wed Apr 8 14:58:47 2009 +0200

    libtracker-data: Remove unused functions
---
 .../libtracker-common-sections.txt                 |   38 -
 src/libtracker-data/Makefile.am                    |    4 -
 src/libtracker-data/tracker-data-query.c           |  125 ---
 src/libtracker-data/tracker-data-query.h           |    8 -
 src/libtracker-data/tracker-data-schema.c          |  267 -------
 src/libtracker-data/tracker-data-schema.h          |   62 --
 src/libtracker-data/tracker-data-search.c          |  740 ------------------
 src/libtracker-data/tracker-data-search.h          |   51 --
 src/libtracker-data/tracker-field-data.c           |  811 --------------------
 src/libtracker-data/tracker-field-data.h           |  102 ---
 src/trackerd/tracker-search.c                      |    1 -
 11 files changed, 0 insertions(+), 2209 deletions(-)

diff --git a/docs/reference/libtracker-common/libtracker-common-sections.txt b/docs/reference/libtracker-common/libtracker-common-sections.txt
index 97f51f6..9fe89b9 100644
--- a/docs/reference/libtracker-common/libtracker-common-sections.txt
+++ b/docs/reference/libtracker-common/libtracker-common-sections.txt
@@ -177,44 +177,6 @@ TRACKER_TYPE_FIELD_TYPE
 tracker_field_type_get_type
 </SECTION>
 
-<INCLUDE>libtracker-common/tracker-field-data.h</INCLUDE>
-<SECTION>
-<FILE>tracker-field-data</FILE>
-<TITLE>Field Data</TITLE>
-TrackerFieldData
-tracker_field_data_new
-tracker_field_data_get_alias
-tracker_field_data_get_data_type
-tracker_field_data_get_field_name
-tracker_field_data_get_id_field
-tracker_field_data_get_is_condition
-tracker_field_data_get_is_select
-tracker_field_data_get_multiple_values
-tracker_field_data_get_needs_join
-tracker_field_data_get_select_field
-tracker_field_data_get_table_name
-tracker_field_data_get_where_field
-tracker_field_data_set_alias
-tracker_field_data_set_data_type
-tracker_field_data_set_field_name
-tracker_field_data_set_id_field
-tracker_field_data_set_is_condition
-tracker_field_data_set_is_select
-tracker_field_data_set_multiple_values
-tracker_field_data_set_needs_join
-tracker_field_data_set_select_field
-tracker_field_data_set_table_name
-tracker_field_data_set_where_field
-<SUBSECTION Standard>
-TRACKER_FIELD_DATA
-TRACKER_IS_FIELD_DATA
-TRACKER_TYPE_FIELD_DATA
-tracker_field_data_get_type
-TRACKER_FIELD_DATA_CLASS
-TRACKER_IS_FIELD_DATA_CLASS
-TRACKER_FIELD_DATA_GET_CLASS
-</SECTION>
-
 <INCLUDE>libtracker-common/tracker-type-utils.h</INCLUDE>
 <SECTION>
 <FILE>tracker-type-utils</FILE>
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index fa7a6e3..63e2ba6 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -19,10 +19,8 @@ libtracker_data_la_SOURCES = 						\
 	tracker-data-manager.c						\
 	tracker-data-metadata.c						\
 	tracker-data-query.c						\
-	tracker-data-schema.c						\
 	tracker-data-search.c						\
 	tracker-data-update.c						\
-	tracker-field-data.c						\
 	tracker-query-tree.c						\
 	tracker-turtle.c						
 
@@ -31,10 +29,8 @@ noinst_HEADERS =							\
 	tracker-data-manager.h						\
 	tracker-data-metadata.h						\
 	tracker-data-query.h						\
-	tracker-data-schema.h						\
 	tracker-data-search.h						\
 	tracker-data-update.h						\
-	tracker-field-data.h						\
 	tracker-query-tree.h						\
 	tracker-turtle.h						
 
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index 895db97..9b28a1a 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -40,62 +40,6 @@
 
 #include "tracker-data-manager.h"
 #include "tracker-data-query.h"
-#include "tracker-data-schema.h"
-
-TrackerDBResultSet *
-tracker_data_query_metadata_field (TrackerDBInterface *iface,
-				   const gchar	      *id,
-				   const gchar	      *field)
-{
-	TrackerField *def;
-	const gchar  *proc = NULL;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-	g_return_val_if_fail (field != NULL, NULL);
-
-	def = tracker_ontology_get_field_by_name (field);
-
-	if (!def) {
-		g_warning ("Metadata not found for id:'%s' and type:'%s'", id, field);
-		return NULL;
-	}
-
-	switch (tracker_field_get_data_type (def)) {
-	case TRACKER_FIELD_TYPE_INDEX:
-	case TRACKER_FIELD_TYPE_STRING:
-	case TRACKER_FIELD_TYPE_DOUBLE:
-		proc = "GetMetadata";
-		break;
-
-	case TRACKER_FIELD_TYPE_INTEGER:
-	case TRACKER_FIELD_TYPE_DATE:
-		proc = "GetMetadataNumeric";
-		break;
-
-	case TRACKER_FIELD_TYPE_FULLTEXT:
-		proc = "GetContents";
-		break;
-
-	case TRACKER_FIELD_TYPE_KEYWORD:
-		proc = "GetMetadataKeyword";
-		break;
-
-	default:
-	case TRACKER_FIELD_TYPE_BLOB:
-	case TRACKER_FIELD_TYPE_STRUCT:
-	case TRACKER_FIELD_TYPE_LINK:
-		g_warning ("Metadata could not be retrieved as type:%d is not supported",
-			   tracker_field_get_data_type (def));
-		return NULL;
-	}
-
-	return tracker_data_manager_exec_proc (iface,
-				     proc,
-				     id,
-				     tracker_field_get_id (def),
-				     NULL);
-}
 
 static void
 db_result_set_to_ptr_array (TrackerDBResultSet *result_set,
@@ -156,75 +100,6 @@ tracker_data_query_all_metadata (const gchar *service_type,
 
 }
 
-TrackerDBResultSet *
-tracker_data_query_metadata_fields (TrackerDBInterface *iface,
-				    const gchar	       *service_type,
-				    const gchar	       *service_id,
-				    gchar	      **fields)
-{
-	TrackerDBResultSet *result_set;
-	GString		   *sql, *sql_join;
-	gchar		   *query;
-	guint		    i;
-
-	/* Build SQL select clause */
-	sql = g_string_new (" SELECT DISTINCT ");
-	sql_join = g_string_new (" FROM Services S ");
-
-	for (i = 0; i < g_strv_length (fields); i++) {
-		TrackerFieldData *field_data;
-
-		field_data = tracker_data_schema_get_metadata_field (iface,
-							    service_type,
-							    fields[i],
-							    i,
-							    TRUE,
-							    FALSE);
-
-		if (!field_data) {
-			g_string_free (sql_join, TRUE);
-			g_string_free (sql, TRUE);
-			return NULL;
-		}
-
-		if (i == 0) {
-			g_string_append_printf (sql, " %s",
-						tracker_field_data_get_select_field (field_data));
-		} else {
-			g_string_append_printf (sql, ", %s",
-						tracker_field_data_get_select_field (field_data));
-		}
-
-		if (tracker_field_data_get_needs_join (field_data)) {
-			g_string_append_printf (sql_join,
-						"\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
-						tracker_field_data_get_table_name (field_data),
-						tracker_field_data_get_alias (field_data),
-						tracker_field_data_get_alias (field_data),
-						tracker_field_data_get_alias (field_data),
-						tracker_field_data_get_id_field (field_data));
-		}
-
-		g_object_unref (field_data);
-	}
-
-	g_string_append (sql, sql_join->str);
-	g_string_free (sql_join, TRUE);
-
-	/* Build SQL where clause */
-	g_string_append_printf (sql, " WHERE S.ID = %s", service_id);
-
-	query = g_string_free (sql, FALSE);
-
-	g_debug ("%s", query);
-
-	result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
-
-	g_free (query);
-
-	return result_set;
-}
-
 /*
  * Obtain the concrete service type name for the file id.
  */
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-data/tracker-data-query.h
index 9ad009e..352ed3e 100644
--- a/src/libtracker-data/tracker-data-query.h
+++ b/src/libtracker-data/tracker-data-query.h
@@ -36,20 +36,12 @@
 #include <libtracker-db/tracker-db-index.h>
 
 #include "tracker-data-metadata.h"
-#include "tracker-field-data.h"
 
 G_BEGIN_DECLS
 
 /* Metadata API */
-TrackerDBResultSet * tracker_data_query_metadata_field        (TrackerDBInterface  *iface,
-							       const gchar         *service_id,
-							       const gchar         *field);
 GPtrArray *          tracker_data_query_all_metadata          (const gchar         *service_type,
 							       const gchar         *service_id);
-TrackerDBResultSet * tracker_data_query_metadata_fields       (TrackerDBInterface  *iface,
-							       const gchar         *service_type,
-							       const gchar         *service_id,
-							       gchar              **fields);
 TrackerDataMetadata *tracker_data_query_metadata              (TrackerService      *service,
 							       guint32              service_id,
 							       gboolean             embedded);
diff --git a/src/libtracker-data/tracker-data-schema.c b/src/libtracker-data/tracker-data-schema.c
deleted file mode 100644
index d1bc655..0000000
--- a/src/libtracker-data/tracker-data-schema.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2007, Jason Kivlighn (jkivlighn gmail com)
- * Copyright (C) 2007, Creative Commons (http://creativecommons.org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-nfs-lock.h>
-#include <libtracker-common/tracker-parser.h>
-#include <libtracker-common/tracker-type-utils.h>
-#include <libtracker-common/tracker-utils.h>
-
-#include <libtracker-db/tracker-db-index.h>
-#include <libtracker-db/tracker-db-interface-sqlite.h>
-#include <libtracker-db/tracker-db-index-manager.h>
-#include <libtracker-db/tracker-db-manager.h>
-
-#include "tracker-data-manager.h"
-#include "tracker-data-schema.h"
-
-GArray *
-tracker_data_schema_create_service_array (const gchar *service,
-					  gboolean     basic_services)
-{
-	GArray	 *array;
-
-	if (service) {
-		array = tracker_ontology_get_subcategory_ids (service);
-	} else if (basic_services) {
-		array = tracker_ontology_get_subcategory_ids ("Files");
-	} else {
-		array = tracker_ontology_get_subcategory_ids ("*");
-	}
-
-	return array;
-}
-
-gchar *
-tracker_data_schema_get_field_name (const gchar *service,
-				    const gchar *meta_name)
-{
-	gint key_field;
-
-	/* Replace with tracker_ontology_get_field_name_by_service_name */
-	key_field = tracker_ontology_service_get_key_metadata (service, meta_name);
-
-	if (key_field > 0) {
-		return g_strdup_printf ("KeyMetadata%d", key_field);
-	}
-
-	if (strcasecmp (meta_name, "File:Path") == 0)	  return g_strdup ("Path");
-	if (strcasecmp (meta_name, "File:Name") == 0)	  return g_strdup ("Name");
-	if (strcasecmp (meta_name, "File:Mime") == 0)	  return g_strdup ("Mime");
-	if (strcasecmp (meta_name, "File:Size") == 0)	  return g_strdup ("Size");
-	if (strcasecmp (meta_name, "File:Rank") == 0)	  return g_strdup ("Rank");
-	if (strcasecmp (meta_name, "File:Modified") == 0) return g_strdup ("IndexTime");
-
-	return NULL;
-}
-
-gchar *
-tracker_data_schema_metadata_field_get_related_names (TrackerDBInterface *iface,
-						      const gchar	 *name)
-{
-	TrackerDBResultSet *result_set;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (name != NULL, NULL);
-
-	result_set = tracker_data_manager_exec_proc (iface,
-					   "GetMetadataAliasesForName",
-					   name,
-					   name,
-					   NULL);
-
-	if (result_set) {
-		GString  *s = NULL;
-		gboolean  valid = TRUE;
-		gint	  id;
-
-		while (valid) {
-			tracker_db_result_set_get (result_set, 1, &id, -1);
-
-			if (s) {
-				g_string_append_printf (s, ", %d", id);
-			} else {
-				s = g_string_new ("");
-				g_string_append_printf (s, "%d", id);
-			}
-
-			valid = tracker_db_result_set_iter_next (result_set);
-		}
-
-		g_object_unref (result_set);
-
-		return g_string_free (s, FALSE);
-	}
-
-	return NULL;
-}
-
-const gchar *
-tracker_data_schema_metadata_field_get_db_table (TrackerFieldType type)
-{
-	switch (type) {
-	case TRACKER_FIELD_TYPE_INDEX:
-	case TRACKER_FIELD_TYPE_STRING:
-	case TRACKER_FIELD_TYPE_DOUBLE:
-		return "ServiceMetaData";
-
-	case TRACKER_FIELD_TYPE_INTEGER:
-	case TRACKER_FIELD_TYPE_DATE:
-		return "ServiceNumericMetaData";
-
-	case TRACKER_FIELD_TYPE_BLOB:
-		return "ServiceBlobMetaData";
-
-	case TRACKER_FIELD_TYPE_KEYWORD:
-		return "ServiceKeywordMetaData";
-
-	default:
-	case TRACKER_FIELD_TYPE_FULLTEXT:
-	case TRACKER_FIELD_TYPE_STRUCT:
-	case TRACKER_FIELD_TYPE_LINK:
-		break;
-	}
-
-	return NULL;
-}
-
-TrackerFieldData *
-tracker_data_schema_get_metadata_field (TrackerDBInterface *iface,
-				        const gchar	   *service,
-				        const gchar	   *field_name,
-				        gint		    field_count,
-				        gboolean	    is_select,
-				        gboolean	    is_condition)
-{
-	TrackerFieldData *field_data = NULL;
-	TrackerField	 *def;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (service != NULL, NULL);
-	g_return_val_if_fail (field_name != NULL, NULL);
-
-	def = tracker_ontology_get_field_by_name (field_name);
-
-	if (def) {
-		gchar	    *alias;
-		const gchar *table_name;
-		gchar	    *this_field_name;
-		gchar	    *where_field;
-		gchar       *order_field;
-		gint         key_collate;
-
-		field_data = g_object_new (TRACKER_TYPE_FIELD_DATA,
-					   "is-select", is_select,
-					   "is-condition", is_condition,
-					   "field-name", field_name,
-					   NULL);
-
-		alias = g_strdup_printf ("M%d", field_count);
-		table_name = tracker_data_schema_metadata_field_get_db_table (tracker_field_get_data_type (def));
-
-		g_debug ("Field_name: %s :table_name is: %s for data_type: %i",
-			 field_name,
-			 table_name,
-			 tracker_field_get_data_type(def));
-
-		tracker_field_data_set_alias (field_data, alias);
-		tracker_field_data_set_table_name (field_data, table_name);
-		tracker_field_data_set_id_field (field_data, tracker_field_get_id (def));
-		tracker_field_data_set_data_type (field_data, tracker_field_get_data_type (def));
-		tracker_field_data_set_multiple_values (field_data, tracker_field_get_multiple_values (def));
-
-		this_field_name = tracker_data_schema_get_field_name (service, field_name);
-
-		if (this_field_name) {
-			gchar *str;
-
-			str = g_strdup_printf (" S.%s ", this_field_name);
-			tracker_field_data_set_select_field (field_data, str);
-			tracker_field_data_set_needs_join (field_data, FALSE);
-			g_free (str);
-			g_free (this_field_name);
-		} else {
-			gchar *str;
-			gchar *display_field;
-
-			display_field = tracker_ontology_field_get_display_name (def);
-			str = g_strdup_printf ("M%d.%s", field_count, display_field);
-			tracker_field_data_set_select_field (field_data, str);
-			tracker_field_data_set_needs_join (field_data, TRUE);
-			g_free (str);
-			g_free (display_field);
-		}
-
-		if ((tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_DOUBLE) ||
-		    (tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX)  ||
-		    (tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_STRING)) {
-			where_field = g_strdup_printf ("M%d.MetaDataDisplay", field_count);
-		} else {
-			where_field = g_strdup_printf ("M%d.MetaDataValue", field_count);
-		}
-
-		tracker_field_data_set_where_field (field_data, where_field);
-
-		key_collate = tracker_ontology_service_get_key_metadata (service, field_name);
-
-		if (key_collate > 0 && key_collate <= 5) {
-			gchar *str;
-
-			str = g_strdup_printf (" S.KeyMetadataCollation%d", key_collate);
-			tracker_field_data_set_order_field (field_data, str);
-			tracker_field_data_set_needs_collate (field_data, FALSE);
-			g_free (str);
-		} else if (key_collate >= 6 && key_collate <= 8) {
-			gchar *str;
-			
-			str = g_strdup_printf (" S.KeyMetadata%d", key_collate);
-			tracker_field_data_set_order_field (field_data, str);
-			tracker_field_data_set_needs_collate (field_data, FALSE);
-			g_free (str);
-		} else {
-			if ((tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_DOUBLE) ||
-			    (tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX)  ||
-			    (tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_STRING)) {
-				order_field = g_strdup_printf ("M%d.MetaDataCollation", field_count);
-			} else {
-				order_field = g_strdup_printf ("M%d.MetaDataValue", field_count);
-			}
-			tracker_field_data_set_needs_collate (field_data, TRUE);
-			tracker_field_data_set_order_field (field_data, order_field);
-			g_free (order_field);
-		}
-		
-		tracker_field_data_set_needs_null (field_data, FALSE);
-		g_free (where_field);
-		g_free (alias);
-	}
-
-	return field_data;
-}
-
diff --git a/src/libtracker-data/tracker-data-schema.h b/src/libtracker-data/tracker-data-schema.h
deleted file mode 100644
index 3c7abd5..0000000
--- a/src/libtracker-data/tracker-data-schema.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2007, Jason Kivlighn (jkivlighn gmail com)
- * Copyright (C) 2007, Creative Commons (http://creativecommons.org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#ifndef __TRACKER_DATA_SCHEMA_H__
-#define __TRACKER_DATA_SCHEMA_H__
-
-#include <glib.h>
-
-#include <libtracker-common/tracker-config.h>
-#include <libtracker-common/tracker-field.h>
-#include <libtracker-common/tracker-language.h>
-#include <libtracker-common/tracker-ontology.h>
-
-#include <libtracker-db/tracker-db-interface.h>
-#include <libtracker-db/tracker-db-file-info.h>
-#include <libtracker-db/tracker-db-index.h>
-
-#include "tracker-field-data.h"
-
-G_BEGIN_DECLS
-
-GArray *            tracker_data_schema_create_service_array             (const gchar        *service,
-									  gboolean            basic_services);
-
-/* Metadata API */
-gchar *             tracker_data_schema_metadata_field_get_related_names (TrackerDBInterface *iface,
-									  const gchar        *name);
-const gchar *       tracker_data_schema_metadata_field_get_db_table      (TrackerFieldType    type);
-
-/* Miscellaneous API */
-gchar *             tracker_data_schema_get_field_name                   (const gchar        *service,
-									  const gchar        *meta_name);
-TrackerFieldData *  tracker_data_schema_get_metadata_field               (TrackerDBInterface *iface,
-									  const gchar        *service,
-									  const gchar        *field_name,
-									  gint                field_count,
-									  gboolean            is_select,
-									  gboolean            is_condition);
-
-G_END_DECLS
-
-#endif /* __TRACKER_DATA_SCHEMA_H__ */
diff --git a/src/libtracker-data/tracker-data-search.c b/src/libtracker-data/tracker-data-search.c
index 1a9fd5b..4004e99 100644
--- a/src/libtracker-data/tracker-data-search.c
+++ b/src/libtracker-data/tracker-data-search.c
@@ -37,439 +37,11 @@
 
 #include "tracker-data-manager.h"
 #include "tracker-data-query.h"
-#include "tracker-data-schema.h"
 #include "tracker-data-search.h"
 #include "tracker-query-tree.h"
 
 #define DEFAULT_METADATA_MAX_HITS 1024
 
-TrackerDBResultSet *
-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;
-	GArray		    *hits;
-	gint		     count;
-	const gchar	    *procedure;
-	GArray		    *services = NULL;
-	guint		     i = 0;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (service != NULL, NULL);
-	g_return_val_if_fail (search_string != NULL, NULL);
-	g_return_val_if_fail (offset >= 0, NULL);
-
-	services = tracker_data_schema_create_service_array (service, FALSE);
-	/* FIXME: Do we need both index and services here? We used to have it */
-	tree = tracker_query_tree_new (search_string,
-				       tracker_data_manager_get_config (),
-				       tracker_data_manager_get_language (),
-				       services);
-	hits = tracker_query_tree_get_hits (tree, offset, limit);
-	result = NULL;
-
-	if (save_results) {
-		tracker_db_interface_start_transaction (iface);
-		tracker_data_manager_exec_proc (iface,
-				      "DeleteSearchResults1",
-				      NULL);
-	}
-
-	count = 0;
-
-	for (i = 0; i < hits->len; i++) {
-		TrackerDBIndexItemRank	rank;
-		gchar		       *str_id;
-
-		if (count >= limit) {
-			break;
-		}
-
-		rank = g_array_index (hits, TrackerDBIndexItemRank, i);
-		str_id = tracker_guint_to_string (rank.service_id);
-
-		/* We save results into SearchResults table instead of
-		 * returing an array of array of strings
-		 */
-		if (save_results) {
-			gchar *str_score;
-
-			str_score = tracker_gint_to_string (rank.score);
-			tracker_data_manager_exec_proc (iface,
-					      "InsertSearchResult1",
-					      str_id,
-					      str_score,
-					      NULL);
-			g_free (str_id);
-			g_free (str_score);
-
-			continue;
-		}
-
-		if (detailed) {
-			if (strcmp (service, "Emails") == 0) {
-				procedure = "GetEmailByID";
-			} else if (strcmp (service, "Applications") == 0) {
-				procedure = "GetApplicationByID";
-			} else {
-				procedure = "GetFileByID2";
-			}
-		} else {
-			procedure = "GetFileByID";
-		}
-
-		result_set = tracker_data_manager_exec_proc (iface,
-						   procedure,
-						   str_id,
-						   NULL);
-		g_free (str_id);
-
-		if (result_set) {
-			gchar *path;
-			guint  columns, t;
-
-			tracker_db_result_set_get (result_set, 0, &path, -1);
-
-				columns = tracker_db_result_set_get_n_columns (result_set);
-
-				if (G_UNLIKELY (!result)) {
-					guint lcolumns;
-
-					lcolumns = tracker_db_result_set_get_n_columns (result_set);
-					result = _tracker_db_result_set_new (lcolumns);
-				}
-
-				_tracker_db_result_set_append (result);
-
-				for (t = 0; t < columns; t++) {
-					GValue value = { 0, };
-
-					_tracker_db_result_set_get_value (result_set, t, &value);
-					_tracker_db_result_set_set_value (result, t, &value);
-					g_value_unset (&value);
-				}
-
-			g_free (path);
-			g_object_unref (result_set);
-		}
-	}
-
-	if (save_results) {
-		tracker_db_interface_end_transaction (iface);
-	}
-
-	g_object_unref (tree);
-	g_array_free (hits, TRUE);
-
-	if (!result) {
-		return NULL;
-	}
-
-	if (tracker_db_result_set_get_n_rows (result) == 0) {
-		g_object_unref (result);
-		return NULL;
-	}
-
-	tracker_db_result_set_rewind (result);
-
-	return result;
-}
-
-TrackerDBResultSet *
-tracker_data_search_text_and_mime (TrackerDBInterface  *iface,
-				   const gchar	       *text,
-				   gchar	      **mime_array)
-{
-	TrackerQueryTree   *tree;
-	TrackerDBResultSet *result_set1;
-	GArray		   *hits;
-	GArray		   *services;
-	gint		    count = 0;
-	guint		    i;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (mime_array != NULL, NULL);
-
-	result_set1 = NULL;
-	services = tracker_data_schema_create_service_array (NULL, TRUE);
-
-	tree = tracker_query_tree_new (text,
-				       tracker_data_manager_get_config (),
-				       tracker_data_manager_get_language (),
-				       services);
-	hits = tracker_query_tree_get_hits (tree, 0, 0);
-
-	for (i = 0, count = 0; i < hits->len; i++) {
-		TrackerDBResultSet     *result_set2;
-		TrackerDBIndexItemRank	rank;
-		gchar		       *str_id, *mimetype;
-
-		rank = g_array_index (hits, TrackerDBIndexItemRank, i);
-
-		str_id = tracker_guint_to_string (rank.service_id);
-		result_set2 = tracker_data_manager_exec_proc (iface,
-						    "GetFileByID",
-						    str_id,
-						    NULL);
-		g_free (str_id);
-
-		if (result_set2) {
-			tracker_db_result_set_get (result_set2, 2, &mimetype, -1);
-
-			if (tracker_string_in_string_list (mimetype, mime_array) != -1) {
-				GValue value = { 0, };
-
-				if (G_UNLIKELY (!result_set1)) {
-					result_set1 = _tracker_db_result_set_new (2);
-				}
-
-				_tracker_db_result_set_append (result_set1);
-
-				/* copy value in column 0 */
-				_tracker_db_result_set_get_value (result_set2, 0, &value);
-				_tracker_db_result_set_set_value (result_set1, 0, &value);
-				g_value_unset (&value);
-
-				/* copy value in column 1 */
-				_tracker_db_result_set_get_value (result_set2, 1, &value);
-				_tracker_db_result_set_set_value (result_set1, 1, &value);
-				g_value_unset (&value);
-
-				count++;
-			}
-
-			g_free (mimetype);
-			g_object_unref (result_set2);
-		}
-
-		if (count > 2047) {
-			g_warning ("Count is > 2047? Breaking for loop in %s, why?",
-				   __FUNCTION__);
-			break;
-		}
-	}
-
-	g_object_unref (tree);
-	g_array_free (hits, TRUE);
-
-	if (!result_set1) {
-		return NULL;
-	}
-
-	if (tracker_db_result_set_get_n_rows (result_set1) == 0) {
-		g_object_unref (result_set1);
-		return NULL;
-	}
-
-	tracker_db_result_set_rewind (result_set1);
-
-	return result_set1;
-}
-
-TrackerDBResultSet *
-tracker_data_search_text_and_location (TrackerDBInterface *iface,
-				       const gchar	  *text,
-				       const gchar	  *location)
-{
-	TrackerDBResultSet *result_set1;
-	TrackerQueryTree   *tree;
-	GArray		   *hits;
-	GArray		   *services;
-	gchar		   *location_prefix;
-	gint		    count;
-	guint		    i;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (location != NULL, NULL);
-
-	result_set1 = NULL;
-	location_prefix = g_strconcat (location, G_DIR_SEPARATOR_S, NULL);
-	services = tracker_data_schema_create_service_array (NULL, TRUE);
-
-	tree = tracker_query_tree_new (text,
-				       tracker_data_manager_get_config (),
-				       tracker_data_manager_get_language (),
-				       services);
-	hits = tracker_query_tree_get_hits (tree, 0, 0);
-
-	for (i = 0, count = 0; i < hits->len; i++) {
-		TrackerDBResultSet     *result_set2;
-		TrackerDBIndexItemRank	rank;
-		gchar		       *str_id, *path;
-
-		rank = g_array_index (hits, TrackerDBIndexItemRank, i);
-
-		str_id = tracker_guint_to_string (rank.service_id);
-		result_set2 = tracker_data_manager_exec_proc (iface,
-						    "GetFileByID",
-						    str_id,
-						    NULL);
-		g_free (str_id);
-
-		if (result_set2) {
-			tracker_db_result_set_get (result_set2, 0, &path, -1);
-
-			if (g_str_has_prefix (path, location_prefix) ||
-			    strcmp (path, location) == 0) {
-				GValue value = { 0, };
-
-				if (G_UNLIKELY (!result_set1)) {
-					result_set1 = _tracker_db_result_set_new (2);
-				}
-
-				_tracker_db_result_set_append (result_set1);
-
-				/* copy value in column 0 */
-				_tracker_db_result_set_get_value (result_set2, 0, &value);
-				_tracker_db_result_set_set_value (result_set1, 0, &value);
-				g_value_unset (&value);
-
-				/* copy value in column 1 */
-				_tracker_db_result_set_get_value (result_set2, 1, &value);
-				_tracker_db_result_set_set_value (result_set1, 1, &value);
-				g_value_unset (&value);
-
-				count++;
-			}
-
-			g_object_unref (result_set2);
-		}
-
-		if (count > 2047) {
-			g_warning ("Count is > 2047? Breaking for loop in %s, why?",
-				   __FUNCTION__);
-			break;
-		}
-	}
-
-	g_free (location_prefix);
-	g_object_unref (tree);
-	g_array_free (hits, TRUE);
-
-	if (!result_set1) {
-		return NULL;
-	}
-
-	if (tracker_db_result_set_get_n_rows (result_set1) == 0) {
-		g_object_unref (result_set1);
-		return NULL;
-	}
-
-	tracker_db_result_set_rewind (result_set1);
-
-	return result_set1;
-}
-
-TrackerDBResultSet *
-tracker_data_search_text_and_mime_and_location (TrackerDBInterface  *iface,
-						const gchar	    *text,
-						gchar		   **mime_array,
-						const gchar	    *location)
-{
-	TrackerDBResultSet *result_set1;
-	TrackerQueryTree   *tree;
-	GArray		   *hits;
-	GArray		   *services;
-	gchar		   *location_prefix;
-	gint		    count;
-	guint		    i;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (location != NULL, NULL);
-
-	result_set1 = NULL;
-	location_prefix = g_strconcat (location, G_DIR_SEPARATOR_S, NULL);
-	services = tracker_data_schema_create_service_array (NULL, TRUE);
-
-	tree = tracker_query_tree_new (text,
-				       tracker_data_manager_get_config (),
-				       tracker_data_manager_get_language (),
-				       services);
-	hits = tracker_query_tree_get_hits (tree, 0, 0);
-
-	for (i = 0, count = 0; i < hits->len; i++) {
-		TrackerDBResultSet     *result_set2;
-		TrackerDBIndexItemRank	rank;
-		gchar		       *str_id, *path, *mimetype;
-
-		rank = g_array_index (hits, TrackerDBIndexItemRank, i);
-
-		str_id = tracker_guint_to_string (rank.service_id);
-		result_set2 = tracker_data_manager_exec_proc (iface,
-						    "GetFileByID",
-						    str_id,
-						    NULL);
-		g_free (str_id);
-
-		if (result_set2) {
-			tracker_db_result_set_get (result_set2,
-						   0, &path,
-						   2, &mimetype,
-						   -1);
-
-			if ((g_str_has_prefix (path, location_prefix) ||
-			     strcmp (path, location) == 0) &&
-			    tracker_string_in_string_list (mimetype, mime_array) != -1) {
-				GValue value = { 0, };
-
-				if (G_UNLIKELY (!result_set1)) {
-					result_set1 = _tracker_db_result_set_new (2);
-				}
-
-				_tracker_db_result_set_append (result_set1);
-
-				/* copy value in column 0 */
-				_tracker_db_result_set_get_value (result_set2, 0, &value);
-				_tracker_db_result_set_set_value (result_set1, 0, &value);
-				g_value_unset (&value);
-
-				/* copy value in column 1 */
-				_tracker_db_result_set_get_value (result_set2, 1, &value);
-				_tracker_db_result_set_set_value (result_set1, 1, &value);
-				g_value_unset (&value);
-
-				count++;
-			}
-
-			g_free (path);
-			g_free (mimetype);
-			g_object_unref (result_set2);
-		}
-
-		if (count > 2047) {
-			g_warning ("Count is > 2047? Breaking for loop in %s, why?",
-				   __FUNCTION__);
-			break;
-		}
-	}
-
-	g_free (location_prefix);
-	g_object_unref (tree);
-	g_array_free (hits, TRUE);
-
-	if (!result_set1) {
-		return NULL;
-	}
-
-	if (tracker_db_result_set_get_n_rows (result_set1) == 0) {
-		g_object_unref (result_set1);
-		return NULL;
-	}
-
-	tracker_db_result_set_rewind (result_set1);
-
-	return result_set1;
-}
-
 gchar **
 tracker_data_search_files_get (TrackerDBInterface *iface,
 			       const gchar	  *folder_path)
@@ -511,315 +83,3 @@ tracker_data_search_files_get (TrackerDBInterface *iface,
 	return (gchar**) g_ptr_array_free (array, FALSE);
 }
 
-TrackerDBResultSet *
-tracker_data_search_files_get_by_service (TrackerDBInterface *iface,
-					  const gchar	     *service,
-					  gint		      offset,
-					  gint		      limit)
-{
-	TrackerDBResultSet *result_set;
-	gchar		   *str_limit;
-	gchar		   *str_offset;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (service != NULL, NULL);
-
-	str_limit = tracker_gint_to_string (limit);
-	str_offset = tracker_gint_to_string (offset);
-
-	result_set = tracker_data_manager_exec_proc (iface,
-					   "GetByServiceType",
-					   service,
-					   service,
-					   str_offset,
-					   str_limit,
-					   NULL);
-
-	g_free (str_offset);
-	g_free (str_limit);
-
-	return result_set;
-}
-
-TrackerDBResultSet *
-tracker_data_search_files_get_by_mime (TrackerDBInterface  *iface,
-				       gchar		  **mimes,
-				       gint		    n,
-				       gint		    offset,
-				       gint		    limit,
-				       gboolean		    vfs)
-{
-	TrackerDBResultSet *result_set;
-	gint		    i;
-	const gchar	   *service;
-	gchar		   *query;
-	GString		   *str;
-
-	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (mimes != NULL, NULL);
-	g_return_val_if_fail (offset >= 0, NULL);
-
-	if (vfs) {
-		service = "VFS";
-	} else {
-		service = "Files";
-	}
-
-	str = g_string_new ("SELECT DISTINCT S.Path || '/' || S.Name AS uri "
-			    "FROM Services AS S "
-			    "INNER JOIN ServiceKeywordMetaData AS M "
-			    "ON "
-			    "S.ID = M.ServiceID "
-			    "WHERE "
-			    "S.Enabled = 1 "
-			    "AND "
-			    "(S.AuxilaryID = 0 OR S.AuxilaryID IN (SELECT VolumeID FROM Volumes WHERE Enabled = 1)) "
-			    "AND "
-			    "(M.MetaDataID = (SELECT ID FROM MetaDataTypes WHERE MetaName ='File:Mime')) "
-			    "AND "
-			    "(M.MetaDataValue IN ");
-
-	g_string_append_printf (str, "('%s'", mimes[0]);
-
-	for (i = 1; i < n; i++) {
-		g_string_append_printf (str, ", '%s'", mimes[i]);
-	}
-
-	g_string_append (str, ")) ");
-
-	g_string_append_printf (str,
-				"AND "
-				"(S.ServiceTypeID IN (SELECT TypeId FROM ServiceTypes WHERE TypeName = '%s' OR Parent = '%s')) "
-				"LIMIT %d,%d",
-				service,
-				service,
-				offset,
-				limit);
-
-	query = g_string_free (str, FALSE);
-	result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
-	g_free (query);
-
-	return result_set;
-}
-
-TrackerDBResultSet *
-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);
-
-	return tracker_data_manager_exec_proc (iface,
-				     "GetKeywordList",
-				     service,
-				     service,
-				     NULL);
-}
-
-
-TrackerDBResultSet *
-tracker_data_search_metadata_in_path (const gchar	       *path,
-				      gchar		      **fields,
-				      GError		      **error)
-{
-	TrackerDBInterface *iface;
-	TrackerDBResultSet *result_set;
-	TrackerField	   *fds[255];
-	guint		    i;
-	gchar		   *uri_filtered;
-	guint32		    file_id;
-	GString		   *sql;
-	gboolean	    needs_join[255];
-	gchar		   *query;
-
-	g_return_val_if_fail (path != NULL, NULL);
-	g_return_val_if_fail (fields != NULL, NULL);
-	g_return_val_if_fail (g_strv_length (fields) > 0, NULL);
-
-	/* Get fields for metadata list provided */
-	for (i = 0; i < g_strv_length (fields); i++) {
-		fds[i] = tracker_ontology_get_field_by_name (fields[i]);
-
-		if (!fds[i]) {
-			g_set_error (error, TRACKER_DBUS_ERROR, 0,
-				     "Metadata field '%s' was not found",
-				     fields[i]);
-			return NULL;
-		}
-
-	}
-	fds [g_strv_length (fields)] = NULL;
-
-
-	if (g_str_has_suffix (path, G_DIR_SEPARATOR_S)) {
-		/* Remove trailing 'G_DIR_SEPARATOR' */
-		uri_filtered = g_strndup (path, strlen (path) - 1);
-	} else {
-		uri_filtered = g_strdup (path);
-	}
-
-	iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
-	/* Get file ID in database */
-	file_id = tracker_data_query_file_id (NULL, uri_filtered);
-	if (file_id == 0) {
-		g_free (uri_filtered);
-		g_set_error (error, TRACKER_DBUS_ERROR, 0,
-			     "File or directory was not in database, path:'%s'",
-			     path);
-		return NULL;
-	}
-
-	/* Build SELECT clause */
-	sql = g_string_new (" ");
-	g_string_append_printf (sql,
-				"SELECT (S.Path || '%s' || S.Name) as PathName ",
-				G_DIR_SEPARATOR_S);
-
-	for (i = 1; i <= g_strv_length (fields); i++) {
-		gchar *field;
-
-		field = tracker_data_schema_get_field_name ("Files", fields[i-1]);
-
-		if (field) {
-			g_string_append_printf (sql, ", S.%s ", field);
-			g_free (field);
-			needs_join[i - 1] = FALSE;
-		} else {
-			gchar *display_field;
-
-			display_field = tracker_ontology_field_get_display_name (fds[i-1]);
-			g_string_append_printf (sql, ", M%d.%s ", i, display_field);
-			g_free (display_field);
-			needs_join[i - 1] = TRUE;
-		}
-	}
-
-	/* Build FROM clause */
-	g_string_append (sql,
-			 " FROM Services AS S ");
-
-	for (i = 0; i < g_strv_length (fields); i++) {
-		const gchar *table;
-
-		if (!needs_join[i]) {
-			continue;
-		}
-
-		table = tracker_data_schema_metadata_field_get_db_table (tracker_field_get_data_type (fds[i]));
-
-		g_string_append_printf (sql,
-					" LEFT OUTER JOIN %s M%d ON "
-					"S.ID = M%d.ServiceID AND "
-					"M%d.MetaDataID = %s ",
-					table,
-					i + 1,
-					i + 1,
-					i + 1,
-					tracker_field_get_id (fds[i]));
-	}
-
-	/* Build WHERE clause */
-	g_string_append_printf (sql,
-				" "
-				"WHERE "
-				"S.Path = '%s' "
-				"AND "
-				"S.Enabled = 1 "
-				"AND "
-				"(S.AuxilaryID = 0 OR S.AuxilaryID IN (SELECT VolumeID FROM Volumes WHERE Enabled = 1)) ",
-				uri_filtered);
-
-	g_free (uri_filtered);
-
-	query = g_string_free (sql, FALSE);
-	result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
-
-	g_free (query);
-
-	return result_set;
-}
-
-TrackerDBResultSet *
-tracker_data_search_keywords (const gchar	*service_type,
-			      const gchar      **keywords,
-			      gint		 offset,
-			      gint		 max_hits,
-			      GError	       **error)
-{
-	TrackerDBInterface  *iface;
-	TrackerDBResultSet  *result_set;
-	const gchar	   **p;
-	GString		    *search;
-	GString		    *lselect;
-	GString		    *where;
-	gchar		    *related_metadata;
-	gchar		    *query;
-
-	g_return_val_if_fail (service_type != NULL, NULL);
-	g_return_val_if_fail (keywords != NULL, NULL);
-	g_return_val_if_fail (keywords[0] != NULL, NULL);
-
-	if (!tracker_ontology_service_is_valid (service_type)) {
-		g_set_error (error, TRACKER_DBUS_ERROR, 0,
-			     "Service_Type '%s' is invalid or has not been implemented yet",
-			     service_type);
-		return NULL;
-	}
-
-	iface = tracker_db_manager_get_db_interface_by_service (service_type);
-
-	/* Sanity check values */
-	offset = MAX (offset, 0);
-
-	/* Create keyword search string */
-	search = g_string_new ("");
-	g_string_append_printf (search, "'%s'", keywords[0]);
-
-	for (p = keywords + 1; *p; p++) {
-		g_string_append_printf (search, ", '%s'", *p);
-	}
-
-	/* Create select string */
-	lselect = g_string_new (" Select distinct S.Path || '");
-	lselect = g_string_append (lselect, G_DIR_SEPARATOR_S);
-	lselect = g_string_append (lselect,
-				   "' || S.Name as EntityName from Services AS S, ServiceKeywordMetaData AS M ");
-
-	/* Create where string */
-	related_metadata = tracker_data_schema_metadata_field_get_related_names (iface, "User:Keywords");
-
-	where = g_string_new ("");
-	g_string_append_printf (where,
-				" where S.ID = M.ServiceID and M.MetaDataID in (%s) and M.MetaDataValue in (%s) ",
-				related_metadata,
-				search->str);
-	g_free (related_metadata);
-	g_string_free (search, TRUE);
-
-	g_string_append_printf (where,
-				"  and	(S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
-				service_type,
-				service_type);
-
-	/* Add offset and max_hits */
-	g_string_append_printf (where,
-				" Limit %d,%d",
-				offset,
-				max_hits);
-
-	/* Finalize query */
-	query = g_strconcat (lselect->str, where->str, NULL);
-	g_string_free (lselect, TRUE);
-	g_string_free (where, TRUE);
-
-	g_debug ("%s", query);
-
-	result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
-
-	g_free (query);
-
-	return result_set;
-}
-
diff --git a/src/libtracker-data/tracker-data-search.h b/src/libtracker-data/tracker-data-search.h
index 3c12807..b25708b 100644
--- a/src/libtracker-data/tracker-data-search.h
+++ b/src/libtracker-data/tracker-data-search.h
@@ -26,64 +26,13 @@
 
 #include <glib.h>
 
-#include <libtracker-common/tracker-field.h>
-#include <libtracker-common/tracker-language.h>
-#include <libtracker-common/tracker-ontology.h>
-
 #include <libtracker-db/tracker-db-interface.h>
-#include <libtracker-db/tracker-db-file-info.h>
-#include <libtracker-db/tracker-db-index.h>
-
-#include "tracker-field-data.h"
 
 G_BEGIN_DECLS
 
-/* Search API */
-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_data_search_text_and_mime		 (TrackerDBInterface  *iface,
-								  const gchar	      *text,
-								  gchar		     **mime_array);
-TrackerDBResultSet *tracker_data_search_text_and_location	 (TrackerDBInterface  *iface,
-								  const gchar	      *text,
-								  const gchar	      *location);
-TrackerDBResultSet *tracker_data_search_text_and_mime_and_location (TrackerDBInterface  *iface,
-								  const gchar	      *text,
-								  gchar		     **mime_array,
-								  const gchar	      *location);
-
 /* Files API */
 gchar **	    tracker_data_search_files_get		 (TrackerDBInterface  *iface,
 								  const gchar	      *folder_path);
-TrackerDBResultSet *tracker_data_search_files_get_by_service	 (TrackerDBInterface  *iface,
-								  const gchar	      *service,
-								  gint		       offset,
-								  gint		       limit);
-TrackerDBResultSet *tracker_data_search_files_get_by_mime	 (TrackerDBInterface  *iface,
-								  gchar		     **mimes,
-								  gint		       n,
-								  gint		       offset,
-								  gint		       limit,
-								  gboolean	       vfs);
-
-/* Keywords API */
-TrackerDBResultSet *tracker_data_search_keywords_get_list	 (TrackerDBInterface  *iface,
-								  const gchar	      *service);
-
-TrackerDBResultSet *tracker_data_search_metadata_in_path			(const gchar	   *path,
-										 gchar		  **fields,
-										 GError		  **error);
-
-TrackerDBResultSet *tracker_data_search_keywords				(const gchar	   *service_type,
-										 const gchar      **keywords,
-										 gint		    offset,
-										 gint		    max_hits,
-										 GError	          **error);
 
 G_END_DECLS
 
diff --git a/src/libtracker-data/tracker-field-data.c b/src/libtracker-data/tracker-field-data.c
deleted file mode 100644
index 5027dd8..0000000
--- a/src/libtracker-data/tracker-field-data.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia (urho konttori nokia com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <glib.h>
-
-#include "tracker-field-data.h"
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataPriv))
-
-typedef struct _TrackerFieldDataPriv TrackerFieldDataPriv;
-
-struct _TrackerFieldDataPriv {
-	gchar		 *alias;
-
-	gchar		 *table_name;
-	gchar		 *field_name;
-
-	gchar		 *select_field;
-	gchar		 *where_field;
-	gchar            *order_field;
-	gchar		 *id_field;
-
-	TrackerFieldType  data_type;
-
-	gboolean	  multiple_values;
-	gboolean	  is_select;
-	gboolean	  is_condition;
-	gboolean          is_order;
-	gboolean	  needs_join;
-	gboolean          needs_collate;
-	gboolean          needs_null;
-};
-
-static void field_data_finalize     (GObject	  *object);
-static void field_data_get_property (GObject	  *object,
-				     guint	   param_id,
-				     GValue	  *value,
-				     GParamSpec   *pspec);
-static void field_data_set_property (GObject	  *object,
-				     guint	   param_id,
-				     const GValue *value,
-				     GParamSpec   *pspec);
-
-enum {
-	PROP_0,
-	PROP_ALIAS,
-	PROP_TABLE_NAME,
-	PROP_FIELD_NAME,
-	PROP_SELECT_FIELD,
-	PROP_WHERE_FIELD,
-	PROP_ORDER_FIELD,
-	PROP_ID_FIELD,
-	PROP_DATA_TYPE,
-	PROP_MULTIPLE_VALUES,
-	PROP_IS_SELECT,
-	PROP_IS_CONDITION,
-	PROP_IS_ORDER,
-	PROP_NEEDS_JOIN,
-	PROP_NEEDS_COLLATE,
-	PROP_NEEDS_NULL
-};
-
-G_DEFINE_TYPE (TrackerFieldData, tracker_field_data, G_TYPE_OBJECT);
-
-static void
-tracker_field_data_class_init (TrackerFieldDataClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize	   = field_data_finalize;
-	object_class->get_property = field_data_get_property;
-	object_class->set_property = field_data_set_property;
-
-	g_object_class_install_property (object_class,
-					 PROP_ALIAS,
-					 g_param_spec_string ("alias",
-							      "alias",
-							      "A name for this field data",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_TABLE_NAME,
-					 g_param_spec_string ("table-name",
-							      "Table name",
-							      "Table name",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_FIELD_NAME,
-					 g_param_spec_string ("field-name",
-							      "Field name",
-							      "Field name",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_SELECT_FIELD,
-					 g_param_spec_string ("select-field",
-							      "Select field",
-							      "Select field",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_WHERE_FIELD,
-					 g_param_spec_string ("where-field",
-							      "Where field",
-							      "Where field",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_ORDER_FIELD,
-					 g_param_spec_string ("order-field",
-							      "Order field",
-							      "Order field",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_ID_FIELD,
-					 g_param_spec_string ("id-field",
-							      "ID field",
-							      "ID field",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_DATA_TYPE,
-					 g_param_spec_enum ("data-type",
-							    "Data type",
-							    "TrackerField type",
-							    tracker_field_type_get_type (),
-							    TRACKER_FIELD_TYPE_INDEX,
-							    G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_MULTIPLE_VALUES,
-					 g_param_spec_boolean ("multiple-values",
-							       "Multiple values",
-							       "Multiple values",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_IS_SELECT,
-					 g_param_spec_boolean ("is-select",
-							       "Is select",
-							       "Is select",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_IS_CONDITION,
-					 g_param_spec_boolean ("is-condition",
-							       "Is condition",
-							       "Is condition",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_IS_ORDER,
-					 g_param_spec_boolean ("is-order",
-							       "Is order",
-							       "Is order",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_NEEDS_JOIN,
-					 g_param_spec_boolean ("needs-join",
-							       "Needs join",
-							       "Needs join",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_NEEDS_COLLATE,
-					 g_param_spec_boolean ("needs-collate",
-							       "Needs collate",
-							       "Needs collate",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_NEEDS_NULL,
-					 g_param_spec_boolean ("needs-null",
-							       "Needs null",
-							       "Needs null",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_type_class_add_private (object_class, sizeof (TrackerFieldDataPriv));
-}
-
-static void
-tracker_field_data_init (TrackerFieldData *field_data)
-{
-}
-
-static void
-field_data_finalize (GObject *object)
-{
-	TrackerFieldDataPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	g_free (priv->alias);
-
-	g_free (priv->table_name);
-	g_free (priv->field_name);
-
-	g_free (priv->select_field);
-	g_free (priv->where_field);
-	g_free (priv->order_field);
-	g_free (priv->id_field);
-
-	(G_OBJECT_CLASS (tracker_field_data_parent_class)->finalize) (object);
-}
-
-static void
-field_data_get_property (GObject    *object,
-			 guint	     param_id,
-			 GValue     *value,
-			 GParamSpec *pspec)
-{
-	TrackerFieldDataPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	switch (param_id) {
-	case PROP_ALIAS:
-		g_value_set_string (value, priv->alias);
-		break;
-	case PROP_TABLE_NAME:
-		g_value_set_string (value, priv->table_name);
-		break;
-	case PROP_FIELD_NAME:
-		g_value_set_string (value, priv->field_name);
-		break;
-	case PROP_SELECT_FIELD:
-		g_value_set_string (value, priv->select_field);
-		break;
-	case PROP_WHERE_FIELD:
-		g_value_set_string (value, priv->where_field);
-	case PROP_ORDER_FIELD:
-		g_value_set_string (value, priv->order_field);
-		break;
-	case PROP_ID_FIELD:
-		g_value_set_string (value, priv->id_field);
-		break;
-	case PROP_DATA_TYPE:
-		g_value_set_enum (value, priv->data_type);
-		break;
-	case PROP_MULTIPLE_VALUES:
-		g_value_set_boolean (value, priv->multiple_values);
-		break;
-	case PROP_IS_SELECT:
-		g_value_set_boolean (value, priv->is_select);
-		break;
-	case PROP_IS_CONDITION:
-		g_value_set_boolean (value, priv->is_condition);
-		break;
-	case PROP_IS_ORDER:
-		g_value_set_boolean (value, priv->is_order);
-		break;
-	case PROP_NEEDS_JOIN:
-		g_value_set_boolean (value, priv->needs_join);
-		break;
-	case PROP_NEEDS_COLLATE:
-		g_value_set_boolean (value, priv->needs_collate);
-		break;
-	case PROP_NEEDS_NULL:
-		g_value_set_boolean (value, priv->needs_null);
-		break;		
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	};
-}
-
-static void
-field_data_set_property (GObject      *object,
-			 guint	       param_id,
-			 const GValue *value,
-			 GParamSpec   *pspec)
-{
-	switch (param_id) {
-	case PROP_ALIAS:
-		tracker_field_data_set_alias (TRACKER_FIELD_DATA (object),
-					      g_value_get_string (value));
-		break;
-	case PROP_TABLE_NAME:
-		tracker_field_data_set_table_name (TRACKER_FIELD_DATA (object),
-						   g_value_get_string (value));
-		break;
-	case PROP_FIELD_NAME:
-		tracker_field_data_set_field_name (TRACKER_FIELD_DATA (object),
-						   g_value_get_string (value));
-		break;
-	case PROP_SELECT_FIELD:
-		tracker_field_data_set_select_field (TRACKER_FIELD_DATA (object),
-						     g_value_get_string (value));
-		break;
-	case PROP_WHERE_FIELD:
-		tracker_field_data_set_where_field (TRACKER_FIELD_DATA (object),
-						    g_value_get_string (value));
-		break;
-	case PROP_ORDER_FIELD:
-		tracker_field_data_set_order_field (TRACKER_FIELD_DATA (object),
-						    g_value_get_string (value));
-		break;
-	case PROP_ID_FIELD:
-		tracker_field_data_set_id_field (TRACKER_FIELD_DATA (object),
-						 g_value_get_string (value));
-		break;
-	case PROP_DATA_TYPE:
-		tracker_field_data_set_data_type (TRACKER_FIELD_DATA (object),
-						 g_value_get_enum (value));
-		break;
-	case PROP_MULTIPLE_VALUES:
-		tracker_field_data_set_multiple_values (TRACKER_FIELD_DATA (object),
-							g_value_get_boolean (value));
-		break;
-	case PROP_IS_SELECT:
-		tracker_field_data_set_is_select (TRACKER_FIELD_DATA (object),
-						  g_value_get_boolean (value));
-		break;
-	case PROP_IS_CONDITION:
-		tracker_field_data_set_is_condition (TRACKER_FIELD_DATA (object),
-						     g_value_get_boolean (value));
-		break;
-	case PROP_IS_ORDER:
-		tracker_field_data_set_is_order (TRACKER_FIELD_DATA (object),
-						 g_value_get_boolean (value));
-		break;
-	case PROP_NEEDS_JOIN:
-		tracker_field_data_set_needs_join (TRACKER_FIELD_DATA (object),
-						   g_value_get_boolean (value));
-		break;
-	case PROP_NEEDS_COLLATE:
-		tracker_field_data_set_needs_collate (TRACKER_FIELD_DATA (object),
-						      g_value_get_boolean (value));
-		break;
-	case PROP_NEEDS_NULL:
-		tracker_field_data_set_needs_null (TRACKER_FIELD_DATA (object),
-						   g_value_get_boolean (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	};
-}
-
-TrackerFieldData *
-tracker_field_data_new (void)
-{
-	TrackerFieldData *field_data;
-
-	field_data = g_object_new (TRACKER_TYPE_FIELD_DATA, NULL);
-
-	return field_data;
-}
-
-const gchar *
-tracker_field_data_get_alias (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->alias;
-}
-
-const gchar *
-tracker_field_data_get_table_name (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->table_name;
-}
-
-const gchar *
-tracker_field_data_get_field_name (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->field_name;
-}
-
-const gchar *
-tracker_field_data_get_select_field (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->select_field;
-}
-
-const gchar *
-tracker_field_data_get_where_field (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->where_field;
-}
-
-const gchar *
-tracker_field_data_get_order_field (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->order_field;
-}
-
-const gchar *
-tracker_field_data_get_id_field (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->id_field;
-}
-
-TrackerFieldType
-tracker_field_data_get_data_type (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), TRACKER_FIELD_TYPE_INDEX);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->data_type;
-}
-
-gboolean
-tracker_field_data_get_multiple_values (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->multiple_values;
-}
-
-
-gboolean
-tracker_field_data_get_is_select (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->is_select;
-}
-
-gboolean
-tracker_field_data_get_is_condition (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->is_condition;
-}
-
-gboolean
-tracker_field_data_get_is_order (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->is_order;
-}
-
-gboolean
-tracker_field_data_get_needs_join (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->needs_join;
-}
-
-gboolean
-tracker_field_data_get_needs_collate (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->needs_collate;
-}
-
-gboolean
-tracker_field_data_get_needs_null (TrackerFieldData *field_data)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
-
-	priv = GET_PRIV (field_data);
-
-	return priv->needs_null;
-}
-
-void
-tracker_field_data_set_alias (TrackerFieldData *field_data,
-			      const gchar      *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->alias);
-
-	if (value) {
-		priv->alias = g_strdup (value);
-	} else {
-		priv->alias = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "alias");
-}
-
-void
-tracker_field_data_set_table_name (TrackerFieldData *field_data,
-				   const gchar	    *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->table_name);
-
-	if (value) {
-		priv->table_name = g_strdup (value);
-	} else {
-		priv->table_name = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "table-name");
-}
-
-void
-tracker_field_data_set_field_name (TrackerFieldData *field_data,
-				   const gchar	    *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->field_name);
-
-	if (value) {
-		priv->field_name = g_strdup (value);
-	} else {
-		priv->field_name = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "field-name");
-}
-
-void
-tracker_field_data_set_select_field (TrackerFieldData *field_data,
-				     const gchar      *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->select_field);
-
-	if (value) {
-		priv->select_field = g_strdup (value);
-	} else {
-		priv->select_field = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "select-field");
-}
-
-void
-tracker_field_data_set_where_field (TrackerFieldData *field_data,
-				    const gchar      *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->where_field);
-
-	if (value) {
-		priv->where_field = g_strdup (value);
-	} else {
-		priv->where_field = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "where-field");
-}
-
-void
-tracker_field_data_set_order_field (TrackerFieldData *field_data,
-				    const gchar      *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->order_field);
-
-	if (value) {
-		priv->order_field = g_strdup (value);
-	} else {
-		priv->order_field = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "order-field");
-}
-
-void
-tracker_field_data_set_id_field (TrackerFieldData *field_data,
-				 const gchar	  *value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	g_free (priv->id_field);
-
-	if (value) {
-		priv->id_field = g_strdup (value);
-	} else {
-		priv->id_field = NULL;
-	}
-
-	g_object_notify (G_OBJECT (field_data), "id-field");
-}
-
-void
-tracker_field_data_set_data_type (TrackerFieldData *field_data,
-				  TrackerFieldType  value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->data_type = value;
-	g_object_notify (G_OBJECT (field_data), "data-type");
-}
-
-void
-tracker_field_data_set_multiple_values (TrackerFieldData *field_data,
-					gboolean	  value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->multiple_values = value;
-	g_object_notify (G_OBJECT (field_data), "multiple-values");
-}
-
-void
-tracker_field_data_set_is_select (TrackerFieldData *field_data,
-				  gboolean	    value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->is_select = value;
-	g_object_notify (G_OBJECT (field_data), "is-select");
-}
-
-void
-tracker_field_data_set_is_condition (TrackerFieldData *field_data,
-				     gboolean	       value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->is_condition = value;
-	g_object_notify (G_OBJECT (field_data), "is-condition");
-}
-
-void
-tracker_field_data_set_is_order (TrackerFieldData *field_data,
-				 gboolean	       value)
-{
-	TrackerFieldDataPriv *priv;
-	
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-	
-	priv = GET_PRIV (field_data);
-	
-	priv->is_order = value;
-	g_object_notify (G_OBJECT (field_data), "is-order");
-}
-
-void
-tracker_field_data_set_needs_join (TrackerFieldData *field_data,
-				   gboolean	     value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->needs_join = value;
-	g_object_notify (G_OBJECT (field_data), "needs-join");
-}
-
-void
-tracker_field_data_set_needs_collate (TrackerFieldData *field_data,
-				   gboolean	     value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->needs_collate = value;
-	g_object_notify (G_OBJECT (field_data), "needs-collate");
-}
-
-void
-tracker_field_data_set_needs_null (TrackerFieldData *field_data,
-				   gboolean	     value)
-{
-	TrackerFieldDataPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_FIELD_DATA (field_data));
-
-	priv = GET_PRIV (field_data);
-
-	priv->needs_null = value;
-	g_object_notify (G_OBJECT (field_data), "needs-null");
-}
diff --git a/src/libtracker-data/tracker-field-data.h b/src/libtracker-data/tracker-field-data.h
deleted file mode 100644
index 7b4b534..0000000
--- a/src/libtracker-data/tracker-field-data.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia (urho konttori nokia com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#ifndef __TRACKERD_FIELD_DATA_H__
-#define __TRACKERD_FIELD_DATA_H__
-
-#include <glib-object.h>
-
-#include <libtracker-common/tracker-field.h>
-
-G_BEGIN_DECLS
-
-#define TRACKER_TYPE_FIELD_DATA		(tracker_field_data_get_type ())
-#define TRACKER_FIELD_DATA(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldData))
-#define TRACKER_FIELD_DATA_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass))
-#define TRACKER_IS_FIELD_DATA(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FIELD_DATA))
-#define TRACKER_IS_FIELD_DATA_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_FIELD_DATA))
-#define TRACKER_FIELD_DATA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass))
-
-typedef struct _TrackerFieldData      TrackerFieldData;
-typedef struct _TrackerFieldDataClass TrackerFieldDataClass;
-
-struct _TrackerFieldData {
-	GObject      parent;
-};
-
-struct _TrackerFieldDataClass {
-	GObjectClass parent_class;
-};
-
-GType		  tracker_field_data_get_type		 (void) G_GNUC_CONST;
-
-TrackerFieldData *tracker_field_data_new		 (void);
-
-const gchar *	  tracker_field_data_get_alias		 (TrackerFieldData *field_data);
-const gchar *	  tracker_field_data_get_table_name	 (TrackerFieldData *field_data);
-const gchar *	  tracker_field_data_get_field_name	 (TrackerFieldData *field_data);
-const gchar *	  tracker_field_data_get_select_field	 (TrackerFieldData *field_data);
-const gchar *	  tracker_field_data_get_where_field	 (TrackerFieldData *field_data);
-const gchar *     tracker_field_data_get_order_field     (TrackerFieldData *field_data);
-const gchar *	  tracker_field_data_get_id_field	 (TrackerFieldData *field_data);
-TrackerFieldType  tracker_field_data_get_data_type	 (TrackerFieldData *field_data);
-gboolean	  tracker_field_data_get_multiple_values (TrackerFieldData *field_data);
-gboolean	  tracker_field_data_get_is_select	 (TrackerFieldData *field_data);
-gboolean	  tracker_field_data_get_is_condition	 (TrackerFieldData *field_data);
-gboolean          tracker_field_data_get_is_order        (TrackerFieldData *field_data);
-gboolean	  tracker_field_data_get_needs_join	 (TrackerFieldData *field_data);
-gboolean          tracker_field_data_get_needs_collate   (TrackerFieldData *field_data);
-gboolean          tracker_field_data_get_needs_null      (TrackerFieldData *field_data);
-
-void		  tracker_field_data_set_alias		 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_table_name	 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_field_name	 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_select_field	 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_where_field	 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_order_field	 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_id_field	 (TrackerFieldData *field_data,
-							  const gchar	   *value);
-void		  tracker_field_data_set_data_type	 (TrackerFieldData *field_data,
-							  TrackerFieldType  value);
-void		  tracker_field_data_set_multiple_values (TrackerFieldData *field_data,
-							  gboolean	    value);
-void		  tracker_field_data_set_is_select	 (TrackerFieldData *field_data,
-							  gboolean	    value);
-void		  tracker_field_data_set_is_condition	 (TrackerFieldData *field_data,
-							  gboolean	    value);
-void		  tracker_field_data_set_is_order	 (TrackerFieldData *field_data,
-							  gboolean	    value);
-void		  tracker_field_data_set_needs_join	 (TrackerFieldData *field_data,
-							  gboolean	    value);
-void		  tracker_field_data_set_needs_collate	 (TrackerFieldData *field_data,
-							  gboolean	    value);
-void		  tracker_field_data_set_needs_null	 (TrackerFieldData *field_data,
-							  gboolean	    value);
-G_END_DECLS
-
-#endif /* __TRACKERD_FIELD_DATA_H__ */
-
diff --git a/src/trackerd/tracker-search.c b/src/trackerd/tracker-search.c
index 8ff02d3..1593dfb 100644
--- a/src/trackerd/tracker-search.c
+++ b/src/trackerd/tracker-search.c
@@ -37,7 +37,6 @@
 
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
-#include <libtracker-data/tracker-data-schema.h>
 #include <libtracker-data/tracker-data-search.h>
 #include <libtracker-data/tracker-query-tree.h>
 



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