tracker r1499 - in branches/indexer-split: . src/libtracker-common src/tracker-indexer src/trackerd

From: mr svn gnome org
To: svn-commits-list gnome org
Subject: tracker r1499 - in branches/indexer-split: . src/libtracker-common src/tracker-indexer src/trackerd
Date: Tue, 27 May 2008 11:04:15 +0000 (UTC)
Author: mr
Date: Tue May 27 11:04:14 2008
New Revision: 1499
URL: http://svn.gnome.org/viewvc/tracker?rev=1499&view=rev

Log:
	* src/libtracker-common/Makefile.am:
	* src/libtracker-common/tracker-hal.[ch]:
	* src/libtracker-common/tracker-ontology.[ch]:
	* src/libtracker-common/tracker-parser.[ch]:
	* src/libtracker-common/tracker-service.[ch]:
	* src/libtracker-common/tracker-field.[ch]:
	* src/libtracker-common/tracker-field-data.[ch]:
	* src/tracker-indexer/Makefile.am:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-db-email.c:
	* src/trackerd/tracker-db-sqlite.[ch]:
	* src/trackerd/tracker-db.c:
	* src/trackerd/tracker-dbus-files.c:
	* src/trackerd/tracker-dbus-metadata.c:
	* src/trackerd/tracker-dbus-search.c:
	* src/trackerd/tracker-dbus-xesam.c:
	* src/trackerd/tracker-indexer.c:
	* src/trackerd/tracker-main.[ch]:
	* src/trackerd/tracker-metadata.c:
	* src/trackerd/tracker-process-files.c:
	* src/trackerd/tracker-query-tree.c:
	* src/trackerd/tracker-xesam-ontology.[ch]:
	* src/trackerd/tracker-xesam-query.c: Moved tracker-hal,
	tracker-ontology, tracker-service, tracker-parser, tracker-field
	and tracker-field-data modules to libtracker-common because they
	are shared by the indexer and the daemon.


Added:
   branches/indexer-split/src/libtracker-common/tracker-field-data.c
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-field-data.c
   branches/indexer-split/src/libtracker-common/tracker-field-data.h
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-field-data.h
   branches/indexer-split/src/libtracker-common/tracker-field.c
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-field.c
   branches/indexer-split/src/libtracker-common/tracker-field.h
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-field.h
   branches/indexer-split/src/libtracker-common/tracker-hal.c
      - copied, changed from r1494, /branches/indexer-split/src/trackerd/tracker-hal.c
   branches/indexer-split/src/libtracker-common/tracker-hal.h
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-hal.h
   branches/indexer-split/src/libtracker-common/tracker-ontology.c
      - copied, changed from r1494, /branches/indexer-split/src/trackerd/tracker-ontology.c
   branches/indexer-split/src/libtracker-common/tracker-ontology.h
      - copied, changed from r1494, /branches/indexer-split/src/trackerd/tracker-ontology.h
   branches/indexer-split/src/libtracker-common/tracker-parser.c
      - copied, changed from r1494, /branches/indexer-split/src/trackerd/tracker-parser.c
   branches/indexer-split/src/libtracker-common/tracker-parser.h
      - copied, changed from r1494, /branches/indexer-split/src/trackerd/tracker-parser.h
   branches/indexer-split/src/libtracker-common/tracker-service.c
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-service.c
   branches/indexer-split/src/libtracker-common/tracker-service.h
      - copied unchanged from r1494, /branches/indexer-split/src/trackerd/tracker-service.h
Removed:
   branches/indexer-split/src/tracker-indexer/tracker-field.c
   branches/indexer-split/src/tracker-indexer/tracker-field.h
   branches/indexer-split/src/tracker-indexer/tracker-ontology.c
   branches/indexer-split/src/tracker-indexer/tracker-ontology.h
   branches/indexer-split/src/tracker-indexer/tracker-service.c
   branches/indexer-split/src/tracker-indexer/tracker-service.h
   branches/indexer-split/src/trackerd/tracker-field-data.c
   branches/indexer-split/src/trackerd/tracker-field-data.h
   branches/indexer-split/src/trackerd/tracker-field.c
   branches/indexer-split/src/trackerd/tracker-field.h
   branches/indexer-split/src/trackerd/tracker-hal.c
   branches/indexer-split/src/trackerd/tracker-hal.h
   branches/indexer-split/src/trackerd/tracker-ontology.c
   branches/indexer-split/src/trackerd/tracker-ontology.h
   branches/indexer-split/src/trackerd/tracker-parser.c
   branches/indexer-split/src/trackerd/tracker-parser.h
   branches/indexer-split/src/trackerd/tracker-service.c
   branches/indexer-split/src/trackerd/tracker-service.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/Makefile.am
   branches/indexer-split/src/tracker-indexer/Makefile.am
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-db-email.c
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-db-sqlite.h
   branches/indexer-split/src/trackerd/tracker-db.c
   branches/indexer-split/src/trackerd/tracker-dbus-files.c
   branches/indexer-split/src/trackerd/tracker-dbus-metadata.c
   branches/indexer-split/src/trackerd/tracker-dbus-search.c
   branches/indexer-split/src/trackerd/tracker-dbus-xesam.c
   branches/indexer-split/src/trackerd/tracker-indexer.c
   branches/indexer-split/src/trackerd/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-main.h
   branches/indexer-split/src/trackerd/tracker-metadata.c
   branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-query-tree.c
   branches/indexer-split/src/trackerd/tracker-xesam-ontology.c
   branches/indexer-split/src/trackerd/tracker-xesam-ontology.h
   branches/indexer-split/src/trackerd/tracker-xesam-query.c

Modified: branches/indexer-split/src/libtracker-common/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-common/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker-common/Makefile.am	Tue May 27 11:04:14 2008
@@ -1,5 +1,7 @@
 INCLUDES =					\
 	$(GLIB2_CFLAGS)				\
+	$(PANGO_CFLAGS)				\
+	$(HAL_CFLAGS)				\
 	-DSHAREDIR=\""$(datadir)"\"		\
 	-DG_LOG_DOMAIN=\"Tracker\"		\
 	-I$(top_srcdir)/src
@@ -12,26 +14,48 @@
 os_sources = tracker-os-dependant-unix.c
 endif
 
-libtracker_common_la_SOURCES = 		\
-	$(os_sources)			\
-	tracker-configuration.c 	\
-	tracker-configuration.h 	\
-	tracker-config.c 		\
-	tracker-config.h		\
-	tracker-file-utils.c		\
-	tracker-file-utils.h		\
-	tracker-language.c		\
-	tracker-language.h		\
-	tracker-log.c	 		\
-	tracker-log.h			\
-	tracker-nfs-lock.c		\
-	tracker-nfs-lock.h		\
-	tracker-os-dependant.h		\
-	tracker-type-utils.c		\
-	tracker-type-utils.h		\
-	tracker-utils.c			\
+if HAVE_HAL
+hal_sources = 					\
+	tracker-hal.c        			\
+	tracker-hal.h
+endif
+
+libtracker_common_la_SOURCES = 			\
+	$(os_sources)				\
+	$(hal_sources)				\
+	tracker-configuration.c 		\
+	tracker-configuration.h 		\
+	tracker-config.c 			\
+	tracker-config.h			\
+	tracker-field.c				\
+	tracker-field.h				\
+	tracker-field-data.c			\
+	tracker-field-data.h			\
+	tracker-file-utils.c			\
+	tracker-file-utils.h			\
+	tracker-hal.c				\
+	tracker-hal.h				\
+	tracker-language.c			\
+	tracker-language.h			\
+	tracker-log.c	 			\
+	tracker-log.h				\
+	tracker-nfs-lock.c			\
+	tracker-nfs-lock.h			\
+	tracker-ontology.c			\
+	tracker-ontology.h			\
+	tracker-os-dependant.h			\
+	tracker-parser.c			\
+	tracker-parser.h			\
+	tracker-service.c			\
+	tracker-service.h			\
+	tracker-type-utils.c			\
+	tracker-type-utils.h			\
+	tracker-utils.c				\
 	tracker-utils.h
 
 libtracker_common_la_LDFLAGS = -version-info 0:0:0
-libtracker_common_la_LIBADD = $(GLIB2_LIBS)
+libtracker_common_la_LIBADD = 			\
+	$(GLIB2_LIBS)				\
+	$(PANGO_LIBS)				\
+	$(HAL_LIBS)
 

Copied: branches/indexer-split/src/libtracker-common/tracker-hal.c (from r1494, /branches/indexer-split/src/trackerd/tracker-hal.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-hal.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-hal.c	Tue May 27 11:04:14 2008
@@ -30,9 +30,7 @@
 
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <libtracker-common/tracker-log.h>
-
-#include "tracker-db.h"
+#include "tracker-log.h"
 #include "tracker-hal.h"
 #include "tracker-utils.h"
 
@@ -756,12 +754,14 @@
                 }
                 
                 g_message ("HAL reports system is now powered by %s",
-                             priv->battery_in_use ? "battery" : "AC adapter");
+			   priv->battery_in_use ? "battery" : "AC adapter");
 
+#if 0
                 /* If we have come off battery power wakeup index thread */
                 if (current_state && !priv->battery_in_use) {
                         tracker_notify_file_data_available ();
                 }
+#endif
         } else {
                 gboolean is_mounted;
                

Copied: branches/indexer-split/src/libtracker-common/tracker-ontology.c (from r1494, /branches/indexer-split/src/trackerd/tracker-ontology.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-ontology.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.c	Tue May 27 11:04:14 2008
@@ -24,8 +24,6 @@
 
 #include <glib.h>
 
-//#include <libtracker-common/tracker-file-utils.h>
-
 #include "tracker-ontology.h"
 
 typedef struct {
@@ -59,7 +57,7 @@
 
 static void
 ontology_mime_prefix_foreach (gpointer data, 
-				     gpointer user_data) 
+			      gpointer user_data) 
 {
 	ServiceMimePrefixes *mime_prefix;
 
@@ -71,7 +69,7 @@
 
 gpointer
 ontology_hash_lookup_by_str (GHashTable  *hash_table, 
-				    const gchar *str)
+			     const gchar *str)
 {
 	gpointer *data;
 	gchar    *str_lower;
@@ -85,7 +83,7 @@
 
 gpointer
 ontology_hash_lookup_by_id (GHashTable  *hash_table, 
-				   gint         id)
+			    gint         id)
 {
 	gpointer *data;
 	gchar    *str;
@@ -300,26 +298,6 @@
 
 	return tracker_service_get_id (service);
 }
-/*
-gint
-tracker_ontology_get_id_of_parent_type (const gchar *service_str)
-{
-	TrackerService *service;
-	const gchar    *parent = NULL;
-
-	service = ontology_hash_lookup_by_str (service_table, service_str);
-
-	if (service) {
-		parent = tracker_service_get_parent (service);
-	}
-
-	if (!parent) {
-		return -1;
-	}
-
-	return tracker_ontology_get_id_for_service_type (parent);
-}
-*/
 
 TrackerDBType
 tracker_ontology_get_db_for_service_type (const gchar *service_str)
@@ -404,7 +382,7 @@
 
 gint
 tracker_ontology_metadata_key_in_service (const gchar *service_str, 
-				      const gchar *meta_name)
+					  const gchar *meta_name)
 {
 	TrackerService *service;
 	gint            i;
@@ -485,17 +463,11 @@
 
 void
 tracker_ontology_add_dir_to_service_type (const gchar *service,  
-				 const gchar *path)
+					  const gchar *path)
 {
 	g_return_if_fail (service != NULL);
 	g_return_if_fail (path != NULL);
 	
-	/*
-	if (!tracker_file_is_valid (path)) {
-		g_debug ("Path:'%s' not valid, not adding it for service:'%s'", path, service);
-		return;
-	}
-	*/
 	g_debug ("Adding path:'%s' for service:'%s'", path, service);
 
 	service_directory_list = g_slist_prepend (service_directory_list, 
@@ -508,7 +480,7 @@
 
 void
 tracker_ontology_remove_dir_to_service_type (const gchar *service,  
-				    const gchar *path)
+					     const gchar *path)
 {
 	GSList *found;
 
@@ -556,18 +528,12 @@
 void
 tracker_ontology_add_field (TrackerField *field)
 {
-	g_return_if_fail (field != NULL && tracker_field_get_name (field) != NULL);
+	g_return_if_fail (TRACKER_IS_FIELD (field));
+	g_return_if_fail (tracker_field_get_name (field) != NULL);
 	
 	g_hash_table_insert (metadata_table, 
 			     g_utf8_strdown (tracker_field_get_name (field), -1),
 			     field);
-
-}
-
-static inline gboolean
-is_equal (const char *s1, const char *s2)
-{
-	return (strcasecmp (s1, s2) == 0);
 }
 
 gchar *
@@ -575,10 +541,12 @@
 					       const gchar  *service_type)
 {
 	const gchar *field_name;
-	const gchar *meta_name = tracker_field_get_name (field);
+	const gchar *meta_name;
+	gint         key_field;
 
-	int key_field = tracker_ontology_metadata_key_in_service (service_type, 
-								  meta_name);
+	meta_name = tracker_field_get_name (field);
+	key_field = tracker_ontology_metadata_key_in_service (service_type, 
+							      meta_name);
 
 	if (key_field > 0) {
 		return g_strdup_printf ("KeyMetadata%d", key_field);
@@ -592,17 +560,6 @@
 	} else {
 		return NULL;
 	}
-/*
-  
-	if (is_equal (meta_name, "File:Path")) return g_strdup ("Path");
-	if (is_equal (meta_name, "File:Name")) return g_strdup ("Name");
-	if (is_equal (meta_name, "File:Mime")) return g_strdup ("Mime");
-	if (is_equal (meta_name, "File:Size")) return g_strdup ("Size");
-	if (is_equal (meta_name, "File:Rank")) return g_strdup ("Rank");
-	if (is_equal (meta_name, "File:Modified")) return g_strdup ("IndexTime");
-
-	return NULL;
-*/
 }
 
 gchar *
@@ -612,9 +569,9 @@
 
 	type = tracker_field_get_data_type (field);
 
-	if (type == TRACKER_FIELD_TYPE_INDEX 
-	    || type == TRACKER_FIELD_TYPE_STRING 
-	    || type == TRACKER_FIELD_TYPE_DOUBLE) {
+	if (type == TRACKER_FIELD_TYPE_INDEX ||
+	    type == TRACKER_FIELD_TYPE_STRING || 
+	    type == TRACKER_FIELD_TYPE_DOUBLE) {
 		return g_strdup ("MetaDataDisplay");
 	}
 
@@ -622,9 +579,11 @@
 }
 
 gboolean
-tracker_ontology_field_is_child_of (const gchar *child, const gchar *parent) {
-
-	TrackerField *def_child, *def_parent;
+tracker_ontology_field_is_child_of (const gchar *child, const gchar *parent) 
+{
+	TrackerField *def_child;
+	TrackerField *def_parent;
+	const GSList *tmp;
 
 	def_child = tracker_ontology_get_field_def (child);
 
@@ -632,15 +591,12 @@
 		return FALSE;
 	}
 
-
 	def_parent = tracker_ontology_get_field_def (parent);
 
 	if (!def_parent) {
 		return FALSE;
 	}
 
-	const GSList *tmp;
-
 	for (tmp = tracker_field_get_child_ids (def_parent); tmp; tmp = tmp->next) {
 		
 		if (!tmp->data) return FALSE;
@@ -651,10 +607,8 @@
 	}
 
 	return FALSE;
-
 }
 
-
 TrackerField *
 tracker_ontology_get_field_def (const gchar *name) 
 {

Copied: branches/indexer-split/src/libtracker-common/tracker-ontology.h (from r1494, /branches/indexer-split/src/trackerd/tracker-ontology.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-ontology.h	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.h	Tue May 27 11:04:14 2008
@@ -24,8 +24,8 @@
 
 #include <glib-object.h>
 
-#include "tracker-service.h"
 #include "tracker-field.h"
+#include "tracker-service.h"
 
 G_BEGIN_DECLS
 

Copied: branches/indexer-split/src/libtracker-common/tracker-parser.c (from r1494, /branches/indexer-split/src/trackerd/tracker-parser.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-parser.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-parser.c	Tue May 27 11:04:14 2008
@@ -27,12 +27,9 @@
 
 #include <pango/pango.h>
 
-#include <libtracker-common/tracker-language.h>
-#include <libtracker-common/tracker-log.h>
-
 #include "tracker-parser.h"
+#include "tracker-log.h"
 #include "tracker-utils.h"
-#include "tracker-main.h"
 
 #define INDEX_NUMBER_MIN_LENGTH 6
 

Copied: branches/indexer-split/src/libtracker-common/tracker-parser.h (from r1494, /branches/indexer-split/src/trackerd/tracker-parser.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-parser.h	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-parser.h	Tue May 27 11:04:14 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <libtracker-common/tracker-language.h>
+#include "tracker-language.h"
 
 G_BEGIN_DECLS
 

Modified: branches/indexer-split/src/tracker-indexer/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-indexer/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-indexer/Makefile.am	Tue May 27 11:04:14 2008
@@ -7,65 +7,20 @@
 	-DINDEXER_MODULES_DIR=\""$(libdir)"/tracker/indexer-modules\"	\
 	$(GLIB2_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
-	$(GMIME_CFLAGS)							\
-	$(HAL_CFLAGS)							\
-	$(SQLITE3_CFLAGS)						\
-	$(QDBM_CFLAGS)							\
-	$(UNAC_CFLAGS)							\
 	-I$(top_srcdir)/src
 
-# if HAVE_INOTIFY
-# watch_sources =								\
-# 	linux-inotify-syscalls.h					\
-# 	tracker-inotify.c
-# else
-# if HAVE_FAM
-# watch_sources = tracker-fam.c
-# else
-# if OS_WIN32
-# watch_sources = tracker-win-fs-changes.c
-# else
-# watch_sources = tracker-poll.c
-# endif
-# endif
-# endif
-
-# if OS_WIN32
-# win_sources = tracker-os-dependant-win.c
-# else
-# unix_sources = tracker-os-dependant-unix.c
-# endif
-
-# if HAVE_HAL
-# hal_sources = 								\
-# 	tracker-hal.c             					\
-# 	tracker-hal.h
-# endif
-
 bin_PROGRAMS = tracker-indexer
 
 tracker_indexer_SOURCES =						\
 	main.c								\
-	tracker-field.c							\
-	tracker-field.h							\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
 	tracker-indexer-module.c					\
-	tracker-indexer-module.h					\
-	tracker-ontology.c						\
-	tracker-ontology.h						\
-	tracker-service.c						\
-	tracker-service.h
+	tracker-indexer-module.h
 
 tracker_indexer_LDADD =							\
 	$(GLIB2_LIBS)							\
 	$(GMODULE_LIBS)							\
-	$(FAM_LIBS)							\
-	$(GMIME_LIBS)							\
-	$(HAL_LIBS)							\
-	$(SQLITE3_LIBS)							\
-	$(QDBM_LIBS)							\
-	$(UNAC_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	-lz								\
 	-lm								\

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Tue May 27 11:04:14 2008
@@ -49,6 +49,7 @@
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-db/tracker-db-interface-sqlite.h>
+
 #include <qdbm/depot.h>
 
 #include "tracker-indexer.h"

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Tue May 27 11:04:14 2008
@@ -9,7 +9,6 @@
 	$(GMODULE_CFLAGS)						\
 	$(PANGO_CFLAGS)							\
 	$(GMIME_CFLAGS)							\
-	$(HAL_CFLAGS)							\
 	$(FAM_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(SQLITE3_CFLAGS)						\
@@ -33,12 +32,6 @@
 endif
 endif
 
-if HAVE_HAL
-hal_sources = 								\
-	tracker-hal.c             					\
-	tracker-hal.h
-endif
-
 mail_modulesdir = $(libdir)/tracker/mail-modules
 mail_modules_LTLIBRARIES = \
 	libemail-evolution.la \
@@ -71,7 +64,6 @@
 	$(watch_sources)						\
 	$(win_sources)							\
 	$(unix_sources)							\
-	$(hal_sources)							\
 	tracker-apps.c							\
 	tracker-apps.h							\
 	tracker-cache.c							\
@@ -102,10 +94,6 @@
 	tracker-email.h							\
 	tracker-email-utils.c						\
 	tracker-email-utils.h						\
-	tracker-field.c							\
-	tracker-field.h							\
-	tracker-field-data.c						\
-	tracker-field-data.h						\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
 	tracker-index-stage.c						\
@@ -115,10 +103,6 @@
 	tracker-marshal-main.c						\
 	tracker-metadata.c						\
 	tracker-metadata.h						\
-	tracker-ontology.c						\
-	tracker-ontology.h						\
-	tracker-parser.c						\
-	tracker-parser.h						\
 	tracker-process-files.c						\
 	tracker-process-files.h						\
 	tracker-query-tree.c						\
@@ -127,8 +111,6 @@
 	tracker-rdf-query.h						\
 	tracker-utils.c							\
 	tracker-utils.h							\
-	tracker-service.c						\
-	tracker-service.h						\
 	tracker-ioprio.c						\
 	tracker-ioprio.h						\
 	tracker-watch.h							\
@@ -156,7 +138,6 @@
 	$(DBUS_LIBS)							\
 	$(PANGO_LIBS)							\
 	$(GMIME_LIBS)							\
-	$(HAL_LIBS)							\
 	$(SQLITE3_LIBS)							\
 	$(QDBM_LIBS)							\
 	$(UNAC_LIBS)							\

Modified: branches/indexer-split/src/trackerd/tracker-db-email.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-email.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-email.c	Tue May 27 11:04:14 2008
@@ -25,10 +25,10 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-parser.h>
 #include <libtracker-common/tracker-type-utils.h>
 
 #include "tracker-db-email.h"
-#include "tracker-parser.h"
 
 #define MAX_ADDRESSES 255
 

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.c	Tue May 27 11:04:14 2008
@@ -31,6 +31,7 @@
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-nfs-lock.h>
@@ -45,10 +46,8 @@
 #include "tracker-main.h"
 #include "tracker-utils.h"
 #include "tracker-watch.h"
-#include "tracker-ontology.h"
 #include "tracker-query-tree.h"
 #include "tracker-xesam.h"
-#include "tracker-main.h"
 #include "tracker-xesam-ontology.h"
 
 #define MAX_INDEX_TEXT_LENGTH 1048576

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.h	Tue May 27 11:04:14 2008
@@ -23,11 +23,13 @@
 
 #include <glib.h>
 
+#include <libtracker-common/tracker-field.h>
+#include <libtracker-common/tracker-field-data.h>
+#include <libtracker-common/tracker-ontology.h>
+
 #include <libtracker-db/tracker-db-interface.h>
 #include <libtracker-db/tracker-db-file-info.h>
 
-#include "tracker-field-data.h"
-#include "tracker-ontology.h"
 #include "tracker-indexer.h"
 #include "tracker-utils.h"
 

Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.c	Tue May 27 11:04:14 2008
@@ -30,12 +30,12 @@
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-type-utils.h>
+#include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-os-dependant.h>
 
 #include "tracker-db.h"
 #include "tracker-email.h"
 #include "tracker-metadata.h"
-#include "tracker-ontology.h"
 #include "tracker-process-files.h"
 
 extern Tracker *tracker;

Modified: branches/indexer-split/src/trackerd/tracker-dbus-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-files.c	Tue May 27 11:04:14 2008
@@ -27,13 +27,13 @@
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-type-utils.h>
 
 #include "tracker-dbus.h"
 #include "tracker-dbus-files.h"
 #include "tracker-db.h"
 #include "tracker-metadata.h"
-#include "tracker-ontology.h"
 #include "tracker-marshal.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_FILES, TrackerDBusFilesPriv))

Modified: branches/indexer-split/src/trackerd/tracker-dbus-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-metadata.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-metadata.c	Tue May 27 11:04:14 2008
@@ -25,12 +25,12 @@
 #include <string.h>
 
 #include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-dbus.h"
 #include "tracker-dbus-metadata.h"
 #include "tracker-db.h"
-#include "tracker-field-data.h"
 #include "tracker-marshal.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_METADATA, TrackerDBusMetadataPriv))

Modified: branches/indexer-split/src/trackerd/tracker-dbus-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-search.c	Tue May 27 11:04:14 2008
@@ -26,15 +26,15 @@
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-parser.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-dbus.h"
 #include "tracker-dbus-search.h"
-#include "tracker-parser.h"
 #include "tracker-rdf-query.h"
 #include "tracker-query-tree.h"
 #include "tracker-indexer.h"
-#include "tracker-ontology.h"
 #include "tracker-marshal.h"
 
 #define DEFAULT_SEARCH_MAX_HITS 1024

Modified: branches/indexer-split/src/trackerd/tracker-dbus-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-xesam.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-xesam.c	Tue May 27 11:04:14 2008
@@ -25,6 +25,7 @@
 
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-config.h>
+#include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-dbus.h"
@@ -34,7 +35,6 @@
 #include "tracker-rdf-query.h"
 #include "tracker-query-tree.h"
 #include "tracker-indexer.h"
-#include "tracker-ontology.h"
 #include "tracker-marshal.h"
 
 enum {

Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c	Tue May 27 11:04:14 2008
@@ -52,17 +52,17 @@
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-hal.h>
+#include <libtracker-common/tracker-ontology.h>
 
 #include "tracker-query-tree.h"
 #include "tracker-indexer.h"
 #include "tracker-cache.h"
 #include "tracker-dbus.h"
 #include "tracker-dbus-daemon.h"
-#include "tracker-hal.h"
 #include "tracker-process-files.h"
 #include "tracker-query-tree.h"
 #include "tracker-main.h"
-#include "tracker-ontology.h"
 #include "tracker-status.h"
 #include "tracker-db-manager.h"
 

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Tue May 27 11:04:14 2008
@@ -43,6 +43,8 @@
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-hal.h>
+#include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-nfs-lock.h>
 
@@ -50,10 +52,8 @@
 #include "tracker-cache.h"
 #include "tracker-dbus.h"
 #include "tracker-db-manager.h"
-#include "tracker-hal.h"
 #include "tracker-indexer.h"
 #include "tracker-process-files.h"
-#include "tracker-ontology.h"
 #include "tracker-status.h"
 #include "tracker-watch.h"
 #include "tracker-xesam.h"

Modified: branches/indexer-split/src/trackerd/tracker-main.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.h	Tue May 27 11:04:14 2008
@@ -31,12 +31,13 @@
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-language.h>
+#include <libtracker-common/tracker-parser.h>
+#include <libtracker-common/tracker-hal.h>
+
 #include <libtracker-db/tracker-db-action.h>
 
-#include "tracker-parser.h"
 #include "tracker-indexer.h"
 #include "tracker-index-stage.h"
-#include "tracker-hal.h"
 
 /* default performance options */
 #define MAX_PROCESS_QUEUE_SIZE 100

Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c	Tue May 27 11:04:14 2008
@@ -33,15 +33,13 @@
 
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-os-dependant.h>
 
 #include "tracker-metadata.h"
 #include "tracker-utils.h"
-#include "tracker-ontology.h"
 #include "tracker-main.h"
 
-extern Tracker *tracker;
-
 char *
 tracker_metadata_get_text_file (const char *uri, const char *mime)
 {

Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c	Tue May 27 11:04:14 2008
@@ -32,8 +32,10 @@
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-os-dependant.h>
 #include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-hal.h>
+#include <libtracker-common/tracker-os-dependant.h>
+#include <libtracker-common/tracker-service.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
@@ -45,10 +47,8 @@
 #include "tracker-dbus-daemon.h"
 #include "tracker-cache.h"
 #include "tracker-email.h"
-#include "tracker-hal.h"
 #include "tracker-indexer.h"
 #include "tracker-watch.h"
-#include "tracker-service.h"
 #include "tracker-status.h"
 #include "tracker-process-files.h"
 

Modified: branches/indexer-split/src/trackerd/tracker-query-tree.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.c	Tue May 27 11:04:14 2008
@@ -33,11 +33,11 @@
 #include <glib-object.h>
 
 #include <libtracker-common/tracker-config.h>
+#include <libtracker-common/tracker-parser.h>
+#include <libtracker-common/tracker-ontology.h>
 
 #include "tracker-query-tree.h"
-#include "tracker-parser.h"
 #include "tracker-utils.h"
-#include "tracker-ontology.h"
 
 #define TRACKER_QUERY_TREE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_QUERY_TREE, TrackerQueryTreePrivate))
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-ontology.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-ontology.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-ontology.c	Tue May 27 11:04:14 2008
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 
-//#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-field.h>
 
 #include "tracker-xesam-ontology.h"
 
@@ -55,11 +55,9 @@
 /* Field descriptions */
 static GHashTable *metadata_table;
 
-
-
 static void
 xesam_ontology_mime_prefix_foreach (gpointer data, 
-				     gpointer user_data) 
+				    gpointer user_data) 
 {
 	ServiceMimePrefixes *mime_prefix;
 
@@ -71,7 +69,7 @@
 
 gpointer
 xesam_ontology_hash_lookup_by_str (GHashTable  *hash_table, 
-				    const gchar *str)
+				   const gchar *str)
 {
 	gpointer *data;
 	gchar    *str_lower;
@@ -84,8 +82,8 @@
 }
 
 gpointer
-xesam_ontology_hash_lookup_by_id (GHashTable  *hash_table, 
-				   gint         id)
+xesam_ontology_hash_lookup_by_id (GHashTable *hash_table, 
+				  gint        id)
 {
 	gpointer *data;
 	gchar    *str;
@@ -100,10 +98,13 @@
 void
 tracker_xesam_ontology_init (void)
 {
-
-	g_return_if_fail (service_id_table == NULL 
-			  && service_table == NULL
-			  && mime_service == NULL);
+	if (service_id_table ||
+	    service_table ||
+	    mime_service ||
+	    service_directory_table ||
+	    metadata_table) {
+		return;
+	}
 
 	service_id_table = g_hash_table_new_full (g_str_hash, 
 						  g_str_equal, 
@@ -127,7 +128,7 @@
 
 	metadata_table = g_hash_table_new_full (g_str_hash,
 						g_str_equal,
-						NULL, //Pointer to the object name
+						NULL,
 						g_object_unref);
 }
 
@@ -150,8 +151,8 @@
 
 void 
 tracker_xesam_ontology_add_service_type (TrackerService *service,
-				   GSList         *mimes,
-				   GSList         *mime_prefixes)
+					 GSList         *mimes,
+					 GSList         *mime_prefixes)
 {
 
 	GSList              *mime, *prefix;
@@ -300,26 +301,6 @@
 
 	return tracker_service_get_id (service);
 }
-/*
-gint
-tracker_xesam_ontology_get_id_of_parent_type (const gchar *service_str)
-{
-	TrackerService *service;
-	const gchar    *parent = NULL;
-
-	service = xesam_ontology_hash_lookup_by_str (service_table, service_str);
-
-	if (service) {
-		parent = tracker_service_get_parent (service);
-	}
-
-	if (!parent) {
-		return -1;
-	}
-
-	return tracker_xesam_ontology_get_id_for_service_type (parent);
-}
-*/
 
 TrackerDBType
 tracker_xesam_ontology_get_db_for_service_type (const gchar *service_str)
@@ -374,37 +355,9 @@
 	return tracker_service_get_has_metadata (service);
 }
 
-/* gboolean */
-/* tracker_xesam_ontology_service_type_has_thumbnails (const gchar *service_str) */
-/* { */
-/* 	TrackerService *service; */
-
-/* 	service = xesam_ontology_hash_lookup_by_str (service_table, service_str); */
-
-/* 	if (!service) { */
-/* 		return FALSE; */
-/* 	} */
-
-/* 	return tracker_service_get_has_thumbs (service); */
-/* } */
-
-/* gboolean  */
-/* tracker_xesam_ontology_service_type_has_text (const char *service_str)  */
-/* { */
-/* 	TrackerService *service; */
-
-/* 	service = xesam_ontology_hash_lookup_by_str (service_table, service_str); */
-
-/* 	if (!service) { */
-/* 		return FALSE; */
-/* 	} */
-
-/* 	return tracker_service_get_has_full_text (service); */
-/* } */
-
 gint
 tracker_xesam_ontology_metadata_key_in_service (const gchar *service_str, 
-				      const gchar *meta_name)
+						const gchar *meta_name)
 {
 	TrackerService *service;
 	gint            i;
@@ -485,17 +438,11 @@
 
 void
 tracker_xesam_ontology_add_dir_to_service_type (const gchar *service,  
-				 const gchar *path)
+						const gchar *path)
 {
 	g_return_if_fail (service != NULL);
 	g_return_if_fail (path != NULL);
 	
-	/*
-	if (!tracker_file_is_valid (path)) {
-		g_debug ("Path:'%s' not valid, not adding it for service:'%s'", path, service);
-		return;
-	}
-	*/
 	g_debug ("Adding path:'%s' for service:'%s'", path, service);
 
 	service_directory_list = g_slist_prepend (service_directory_list, 
@@ -508,7 +455,7 @@
 
 void
 tracker_xesam_ontology_remove_dir_to_service_type (const gchar *service,  
-				    const gchar *path)
+						   const gchar *path)
 {
 	GSList *found;
 
@@ -556,7 +503,8 @@
 void
 tracker_xesam_ontology_add_field (TrackerField *field)
 {
-	g_return_if_fail (field != NULL && tracker_field_get_name (field) != NULL);
+	g_return_if_fail (TRACKER_IS_FIELD (field));
+	g_return_if_fail (tracker_field_get_name (field) != NULL);
 	
 	g_hash_table_insert (metadata_table, 
 			     g_utf8_strdown (tracker_field_get_name (field), -1),
@@ -564,21 +512,17 @@
 
 }
 
-static inline gboolean
-is_equal (const char *s1, const char *s2)
-{
-	return (strcasecmp (s1, s2) == 0);
-}
-
 gchar *
-tracker_xesam_ontology_get_field_column_in_services (const TrackerField *field, 
-					       const gchar *service_type)
+tracker_xesam_ontology_get_field_column_in_services (TrackerField *field, 
+						     const gchar  *service_type)
 {
 	const gchar *field_name;
-	const gchar *meta_name = tracker_field_get_name (field);
+	const gchar *meta_name;
+	gint         key_field;
 
-	int key_field = tracker_xesam_ontology_metadata_key_in_service (service_type, 
-								  meta_name);
+	meta_name = tracker_field_get_name (field);
+	key_field = tracker_xesam_ontology_metadata_key_in_service (service_type, 
+								    meta_name);
 
 	if (key_field > 0) {
 		return g_strdup_printf ("KeyMetadata%d", key_field);
@@ -592,29 +536,18 @@
 	} else {
 		return NULL;
 	}
-/*
-  
-	if (is_equal (meta_name, "File:Path")) return g_strdup ("Path");
-	if (is_equal (meta_name, "File:Name")) return g_strdup ("Name");
-	if (is_equal (meta_name, "File:Mime")) return g_strdup ("Mime");
-	if (is_equal (meta_name, "File:Size")) return g_strdup ("Size");
-	if (is_equal (meta_name, "File:Rank")) return g_strdup ("Rank");
-	if (is_equal (meta_name, "File:Modified")) return g_strdup ("IndexTime");
-
-	return NULL;
-*/
 }
 
 gchar *
-tracker_xesam_ontology_get_display_field (const TrackerField *field)
+tracker_xesam_ontology_get_display_field (TrackerField *field)
 {
 	TrackerFieldType type;
 
 	type = tracker_field_get_data_type (field);
 
-	if (type == TRACKER_FIELD_TYPE_INDEX 
-	    || type == TRACKER_FIELD_TYPE_STRING 
-	    || type == TRACKER_FIELD_TYPE_DOUBLE) {
+	if (type == TRACKER_FIELD_TYPE_INDEX ||
+	    type == TRACKER_FIELD_TYPE_STRING || 
+	    type == TRACKER_FIELD_TYPE_DOUBLE) {
 		return g_strdup ("MetaDataDisplay");
 	}
 
@@ -622,9 +555,12 @@
 }
 
 gboolean
-tracker_xesam_ontology_field_is_child_of (const gchar *child, const gchar *parent) {
-
-	const TrackerField *def_child, *def_parent;
+tracker_xesam_ontology_field_is_child_of (const gchar *child, 
+					  const gchar *parent) 
+{
+	TrackerField *def_child;
+	TrackerField *def_parent;
+	const GSList *tmp;
 
 	def_child = tracker_xesam_ontology_get_field_def (child);
 
@@ -632,15 +568,12 @@
 		return FALSE;
 	}
 
-
 	def_parent = tracker_xesam_ontology_get_field_def (parent);
 
 	if (!def_parent) {
 		return FALSE;
 	}
 
-	const GSList *tmp;
-
 	for (tmp = tracker_field_get_child_ids (def_parent); tmp; tmp = tmp->next) {
 		
 		if (!tmp->data) return FALSE;
@@ -651,11 +584,9 @@
 	}
 
 	return FALSE;
-
 }
 
-
-const TrackerField *
+TrackerField *
 tracker_xesam_ontology_get_field_def (const gchar *name) 
 {
 	return xesam_ontology_hash_lookup_by_str (metadata_table, name);
@@ -664,7 +595,7 @@
 const gchar *
 tracker_xesam_ontology_get_field_id (const gchar *name)
 {
-	const TrackerField *field;
+	TrackerField *field;
 
 	field = tracker_xesam_ontology_get_field_def (name);
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-ontology.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-ontology.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-ontology.h	Tue May 27 11:04:14 2008
@@ -24,57 +24,44 @@
 
 #include <glib-object.h>
 
-#include "tracker-service.h"
-#include "tracker-field.h"
+#include <libtracker-common/tracker-field.h>
+#include <libtracker-common/tracker-service.h>
 
 G_BEGIN_DECLS
 
-void                tracker_xesam_ontology_init                         (void);
-void                tracker_xesam_ontology_shutdown                     (void);
-void                tracker_xesam_ontology_add_service_type             (TrackerService *service,
-								   GSList         *mimes,
-								   GSList         *mime_prefixes);
-TrackerService *    tracker_xesam_ontology_get_service_type_by_name     (const gchar    *service_str);
-gchar *             tracker_xesam_ontology_get_service_type_by_id       (gint            id);
-/* gchar *             tracker_xesam_ontology_get_service_type_for_mime    (const gchar    *mime); */
-gint                tracker_xesam_ontology_get_id_for_service_type      (const gchar    *service_str);
-gchar *             tracker_xesam_ontology_get_parent_service           (const gchar    *service_str);
-gchar *             tracker_xesam_ontology_get_parent_service_by_id     (gint            id);
-gint                tracker_xesam_ontology_get_parent_id_for_service_id (gint            id);
-TrackerDBType       tracker_xesam_ontology_get_db_for_service_type      (const gchar    *service_str);
-/* gboolean            tracker_xesam_ontology_service_type_has_embedded    (const gchar    *service_str); */
-gboolean            tracker_xesam_ontology_is_valid_service_type        (const gchar    *service_str);
-/* gboolean            tracker_xesam_ontology_service_type_has_metadata    (const gchar    *service_str); */
-/* gboolean            tracker_xesam_ontology_service_type_has_thumbnails  (const gchar    *service_str); */
-/* gboolean            tracker_xesam_ontology_service_type_has_text        (const gchar    *service_str); */
-/* gint                tracker_xesam_ontology_metadata_key_in_service      (const gchar    *service_str, */
-/* 								   const gchar    *meta_name); */
-gboolean            tracker_xesam_ontology_show_service_directories     (const gchar    *service_str);
-gboolean            tracker_xesam_ontology_show_service_files           (const gchar    *service_str);
-
-
+void            tracker_xesam_ontology_init                         (void);
+void            tracker_xesam_ontology_shutdown                     (void);
+void            tracker_xesam_ontology_add_service_type             (TrackerService *service,
+								     GSList         *mimes,
+								     GSList         *mime_prefixes);
+TrackerService *tracker_xesam_ontology_get_service_type_by_name     (const gchar    *service_str);
+gchar *         tracker_xesam_ontology_get_service_type_by_id       (gint            id);
+gint            tracker_xesam_ontology_get_id_for_service_type      (const gchar    *service_str);
+gchar *         tracker_xesam_ontology_get_parent_service           (const gchar    *service_str);
+gchar *         tracker_xesam_ontology_get_parent_service_by_id     (gint            id);
+gint            tracker_xesam_ontology_get_parent_id_for_service_id (gint            id);
+TrackerDBType   tracker_xesam_ontology_get_db_for_service_type      (const gchar    *service_str);
+gboolean        tracker_xesam_ontology_is_valid_service_type        (const gchar    *service_str);
+gboolean        tracker_xesam_ontology_show_service_directories     (const gchar    *service_str);
+gboolean        tracker_xesam_ontology_show_service_files           (const gchar    *service_str);
 
 /* Service directories */
-GSList *            tracker_xesam_ontology_get_dirs_for_service_type    (const gchar    *service);
-void                tracker_xesam_ontology_add_dir_to_service_type      (const gchar    *service,
-								   const gchar    *path);
-void                tracker_xesam_ontology_remove_dir_to_service_type   (const gchar    *service,
-								   const gchar    *path);
-gchar *             tracker_xesam_ontology_get_service_type_for_dir     (const gchar    *path);
-
-
-
+GSList *        tracker_xesam_ontology_get_dirs_for_service_type    (const gchar    *service);
+void            tracker_xesam_ontology_add_dir_to_service_type      (const gchar    *service,
+								     const gchar    *path);
+void            tracker_xesam_ontology_remove_dir_to_service_type   (const gchar    *service,
+								     const gchar    *path);
+gchar *         tracker_xesam_ontology_get_service_type_for_dir     (const gchar    *path);
 
 /* Field handling */
-void                tracker_xesam_ontology_add_field                    (TrackerField   *field);
-gchar *             tracker_xesam_ontology_get_field_column_in_services (const TrackerField   *field,
-								   const gchar    *service_type);
-gchar *             tracker_xesam_ontology_get_display_field            (const TrackerField   *field);
-gboolean            tracker_xesam_ontology_field_is_child_of            (const gchar    *child,
-								   const gchar    *parent);
-const TrackerField *tracker_xesam_ontology_get_field_def                (const gchar    *name);
-const gchar *       tracker_xesam_ontology_get_field_id                 (const gchar    *name);
-
+void            tracker_xesam_ontology_add_field                    (TrackerField   *field);
+gchar *         tracker_xesam_ontology_get_field_column_in_services (TrackerField   *field,
+								     const gchar    *service_type);
+gchar *         tracker_xesam_ontology_get_display_field            (TrackerField   *field);
+gboolean        tracker_xesam_ontology_field_is_child_of            (const gchar    *child,
+								     const gchar    *parent);
+TrackerField *  tracker_xesam_ontology_get_field_def                (const gchar    *name);
+const gchar *   tracker_xesam_ontology_get_field_id                 (const gchar    *name);
 
 G_END_DECLS
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-query.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-query.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-query.c	Tue May 27 11:04:14 2008
@@ -22,12 +22,11 @@
 #include <string.h>
 
 #include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-xesam-query.h"
-#include "tracker-field-data.h"
-
 
 /* XESAM Query Condition
 <query>
@@ -44,7 +43,6 @@
 </Condition>
 */
 
-
 /* main elements */
 #define ELEMENT_XESAM_QUERY 	        "query"
 #define ELEMENT_XESAM_USER_QUERY        "userQuery"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]