GNOME.org
 

tracker r1769 - in branches/xesam-support: . src/libtracker-db src/tracker-indexer src/tracker-indexer/modules src/trackerd tests/libtracker-db

Author: pvanhoof
Date: Thu Jun 26 09:51:38 2008
New Revision: 1769
URL: http://svn.gnome.org/viewvc/tracker?rev=1769&view=rev

Log:
2008-06-26  Philip Van Hoof  <pvanhoof gnome org>

	* svn merge -r 1761:1768 ../indexer-split



Added:
   branches/xesam-support/src/trackerd/tracker-process.c
      - copied unchanged from r1768, /branches/indexer-split/src/trackerd/tracker-process.c
   branches/xesam-support/src/trackerd/tracker-process.h
      - copied unchanged from r1768, /branches/indexer-split/src/trackerd/tracker-process.h
   branches/xesam-support/tests/libtracker-db/tracker-db-manager-test-custom.c
      - copied unchanged from r1768, /branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c
Removed:
   branches/xesam-support/src/trackerd/tracker-db-email.c
   branches/xesam-support/src/trackerd/tracker-db-email.h
   branches/xesam-support/src/trackerd/tracker-email-evolution.c
   branches/xesam-support/src/trackerd/tracker-email-kmail.c
   branches/xesam-support/src/trackerd/tracker-email-modest.c
   branches/xesam-support/src/trackerd/tracker-email-modest.h
   branches/xesam-support/src/trackerd/tracker-email-plugin.h
   branches/xesam-support/src/trackerd/tracker-email-thunderbird.c
   branches/xesam-support/src/trackerd/tracker-email-utils.c
   branches/xesam-support/src/trackerd/tracker-email-utils.h
   branches/xesam-support/src/trackerd/tracker-email.c
   branches/xesam-support/src/trackerd/tracker-email.h
   branches/xesam-support/src/trackerd/tracker-process-files.c
   branches/xesam-support/src/trackerd/tracker-process-files.h
Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/libtracker-db/tracker-db-manager.c
   branches/xesam-support/src/tracker-indexer/modules/Makefile.am
   branches/xesam-support/src/tracker-indexer/tracker-indexer.c
   branches/xesam-support/src/trackerd/Makefile.am
   branches/xesam-support/src/trackerd/tracker-db.c
   branches/xesam-support/src/trackerd/tracker-indexer.c
   branches/xesam-support/src/trackerd/tracker-main.c
   branches/xesam-support/src/trackerd/tracker-utils.c
   branches/xesam-support/tests/libtracker-db/Makefile.am
   branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.c
   branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.h

Modified: branches/xesam-support/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/xesam-support/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/xesam-support/src/libtracker-db/tracker-db-manager.c	Thu Jun 26 09:51:38 2008
@@ -133,6 +133,8 @@
           FALSE },
 };
 
+static gboolean db_manager_had_init = FALSE;
+
 static gboolean            db_exec_no_reply    (TrackerDBInterface *iface,
 						const gchar        *query,
 						...);
@@ -2503,6 +2505,8 @@
 	va_list             args;
 	TrackerDBInterface *connection = NULL;
 
+	g_return_val_if_fail (initialized != FALSE, NULL);
+
 	va_start (args, num);
 	for (n_args = 1; n_args <= num; n_args++) {
 		TrackerDB db = va_arg (args, TrackerDB);

Modified: branches/xesam-support/src/tracker-indexer/modules/Makefile.am
==============================================================================
--- branches/xesam-support/src/tracker-indexer/modules/Makefile.am	(original)
+++ branches/xesam-support/src/tracker-indexer/modules/Makefile.am	Thu Jun 26 09:51:38 2008
@@ -10,7 +10,7 @@
 	-D_GNU_SOURCE							\
 	-I$(top_srcdir)/src						\
 	$(GMODULE_CFLAGS)						\
-	$(GIO_LIBS)							\
+	$(GIO_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GMIME_CFLAGS)
 

Modified: branches/xesam-support/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/xesam-support/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/xesam-support/src/tracker-indexer/tracker-indexer.c	Thu Jun 26 09:51:38 2008
@@ -343,7 +343,10 @@
 
 	priv->cache = tracker_db_manager_get_db_interface (TRACKER_DB_CACHE);
 	priv->common = tracker_db_manager_get_db_interface (TRACKER_DB_COMMON);
-	priv->metadata = tracker_db_manager_get_db_interfaces (3, TRACKER_DB_COMMON, TRACKER_DB_CACHE, TRACKER_DB_FILE_METADATA);
+	priv->metadata = tracker_db_manager_get_db_interfaces (3, 
+							       TRACKER_DB_COMMON,
+							       TRACKER_DB_CACHE, 
+							       TRACKER_DB_FILE_METADATA);
 	priv->contents = tracker_db_manager_get_db_interface (TRACKER_DB_FILE_CONTENTS);
 
 	priv->timer = g_timer_new ();

Modified: branches/xesam-support/src/trackerd/Makefile.am
==============================================================================
--- branches/xesam-support/src/trackerd/Makefile.am	(original)
+++ branches/xesam-support/src/trackerd/Makefile.am	Thu Jun 26 09:51:38 2008
@@ -19,35 +19,6 @@
 
 
 #
-# Mail sources
-#
-mail_modulesdir = $(libdir)/tracker/mail-modules
-mail_modules_LTLIBRARIES = \
-	libemail-evolution.la \
-	libemail-thunderbird.la \
-	libemail-kmail.la \
-	libemail-modest.la
-
-module_flags = -module -avoid-version -no-undefined
-
-libemail_modest_la_SOURCES = tracker-email-modest.c tracker-email-modest.h
-libemail_modest_la_LDFLAGS = $(module_flags)
-libemail_modest_la_LIBADD = $(GLIB2_LIBS)
-
-libemail_evolution_la_SOURCES = tracker-email-evolution.c
-libemail_evolution_la_LDFLAGS = $(module_flags)
-libemail_evolution_la_LIBADD = $(GLIB2_LIBS)
-
-libemail_thunderbird_la_SOURCES = tracker-email-thunderbird.c
-libemail_thunderbird_la_LDFLAGS = $(module_flags)
-libemail_thunderbird_la_LIBADD = $(GLIB2_LIBS)
-
-libemail_kmail_la_SOURCES = tracker-email-kmail.c
-libemail_kmail_la_LDFLAGS = $(module_flags)
-libemail_kmail_la_LIBADD = $(GLIB2_LIBS)
-
-
-#
 # Daemon sources
 #
 bin_PROGRAMS = trackerd
@@ -59,23 +30,16 @@
 	tracker-daemon.h						\
 	tracker-db.c							\
 	tracker-db.h							\
-	tracker-db-email.c						\
-	tracker-db-email.h						\
 	tracker-dbus.c							\
 	tracker-dbus.h							\
-	tracker-email.c							\
-	tracker-email.h							\
-	tracker-email-utils.c						\
-	tracker-email-utils.h						\
-	tracker-email-plugin.h						\
 	tracker-files.c							\
 	tracker-files.h							\
 	tracker-keywords.c						\
 	tracker-keywords.h						\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
-	tracker-process-files.c						\
-	tracker-process-files.h						\
+	tracker-process.c						\
+	tracker-process.h						\
 	tracker-main.c							\
 	tracker-main.h							\
 	tracker-marshal-main.c						\

Modified: branches/xesam-support/src/trackerd/tracker-db.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-db.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-db.c	Thu Jun 26 09:51:38 2008
@@ -38,7 +38,7 @@
 #include <libtracker-db/tracker-db-manager.h>
 
 #include "tracker-db.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-query-tree.h"
 #include "tracker-monitor.h"
 #include "tracker-xesam-manager.h"

Modified: branches/xesam-support/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-indexer.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-indexer.c	Thu Jun 26 09:51:38 2008
@@ -52,7 +52,7 @@
 #include "tracker-indexer.h"
 #include "tracker-dbus.h"
 #include "tracker-daemon.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-query-tree.h"
 #include "tracker-main.h"
 #include "tracker-status.h"

Modified: branches/xesam-support/src/trackerd/tracker-main.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-main.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-main.c	Thu Jun 26 09:51:38 2008
@@ -45,13 +45,12 @@
 
 #include <libtracker-db/tracker-db-manager.h>
 
-#include "tracker-email.h"
 #include "tracker-crawler.h"
 #include "tracker-dbus.h"
 #include "tracker-indexer.h"
 #include "tracker-indexer-client.h"
 #include "tracker-monitor.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-status.h"
 #include "tracker-xesam-manager.h"
 
@@ -612,8 +611,6 @@
 	tracker_indexer_close (tracker->file_index);
 	tracker_indexer_close (tracker->file_update_index);
 	tracker_indexer_close (tracker->email_index);
-
-	tracker_email_end_email_watching ();
 }
 
 static void
@@ -812,7 +809,6 @@
 	tracker_db_manager_init (flags, &tracker->first_time_index);
 	tracker_db_init ();
 	tracker_xesam_manager_init ();
-	tracker_email_start_email_watching (tracker_config_get_email_client (tracker->config));
 
 	tracker->crawler = tracker_crawler_new ();
 
@@ -887,7 +883,6 @@
 	shutdown_directories ();
 
 	/* Shutdown major subsystems */
-	tracker_email_end_email_watching ();
 	tracker_dbus_shutdown ();
 	tracker_xesam_manager_shutdown ();
 	tracker_db_manager_shutdown (TRUE);

Modified: branches/xesam-support/src/trackerd/tracker-utils.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-utils.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-utils.c	Thu Jun 26 09:51:38 2008
@@ -28,7 +28,7 @@
 
 #include "tracker-utils.h"
 #include "tracker-main.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-xesam-manager.h"
 
 extern Tracker *tracker;

Modified: branches/xesam-support/tests/libtracker-db/Makefile.am
==============================================================================
--- branches/xesam-support/tests/libtracker-db/Makefile.am	(original)
+++ branches/xesam-support/tests/libtracker-db/Makefile.am	Thu Jun 26 09:51:38 2008
@@ -2,7 +2,7 @@
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += tracker-db-manager-unattach tracker-db-manager-attach
+TEST_PROGS += tracker-db-manager-unattach tracker-db-manager-attach tracker-db-manager-custom
 
 INCLUDES = 				\
 	-g 				\
@@ -51,3 +51,20 @@
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)							\
 	-lz
+
+tracker_db_manager_custom_SOURCES = 		\
+	tracker-db-manager-test-custom.c 	\
+	tracker-db-manager-common.c		\
+	tracker-db-manager-common.h
+
+tracker_db_manager_custom_LDADD =					\
+	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+        $(top_builddir)/src/xdgmime/libxdgmime.la                       \
+	$(SQLITE3_LIBS)							\
+	$(QDBM_LIBS)							\
+	$(GMODULE_LIBS)							\
+	$(GTHREAD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	-lz

Modified: branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.c
==============================================================================
--- branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.c	(original)
+++ branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.c	Thu Jun 26 09:51:38 2008
@@ -4,11 +4,19 @@
 test_assert_query_run (TrackerDB db, const gchar *query)
 {
         TrackerDBInterface *iface;
-        TrackerDBResultSet *result_set;
-        GError *error = NULL;
         
         iface = tracker_db_manager_get_db_interface (db);
 
+        return test_assert_query_run_on_iface (iface, query);
+
+}
+
+gboolean
+test_assert_query_run_on_iface (TrackerDBInterface *iface, const gchar *query)
+{
+        TrackerDBResultSet *result_set;
+        GError *error = NULL;
+
         result_set = tracker_db_interface_execute_query (iface, 
                                                          &error, 
                                                          query);
@@ -21,4 +29,3 @@
 
         return TRUE;
 }
-

Modified: branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.h
==============================================================================
--- branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.h	(original)
+++ branches/xesam-support/tests/libtracker-db/tracker-db-manager-common.h	Thu Jun 26 09:51:38 2008
@@ -5,5 +5,6 @@
 #include <libtracker-db/tracker-db-manager.h>
 
 gboolean test_assert_query_run (TrackerDB db, const gchar *query);
+gboolean test_assert_query_run_on_iface (TrackerDBInterface *iface, const gchar *query);
 
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]