tracker r1318 - in branches/indexer-split: . src src/libtracker-db src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Apr 28 12:27:29 2008
New Revision: 1318
URL: http://svn.gnome.org/viewvc/tracker?rev=1318&view=rev

Log:
	* configure.ac:
 	* src/Makefile.am: 
	* src/libtracker-db/Makefile.am: Created new libtracker-db to
	handle the shared database API between daemon and other
	components of Tracker. 

	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-db-sqlite.[ch]: 
	* src/trackerd/tracker-dbus.h:
	* src/trackerd/tracker-indexer.h: Updated files to include new
	libtracker-db files.


Added:
   branches/indexer-split/src/libtracker-db/
   branches/indexer-split/src/libtracker-db/Makefile.am
   branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c
      - copied, changed from r1317, /branches/indexer-split/src/trackerd/tracker-db-interface-sqlite.c
   branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.h
      - copied unchanged from r1317, /branches/indexer-split/src/trackerd/tracker-db-interface-sqlite.h
   branches/indexer-split/src/libtracker-db/tracker-db-interface.c
      - copied unchanged from r1317, /branches/indexer-split/src/trackerd/tracker-db-interface.c
   branches/indexer-split/src/libtracker-db/tracker-db-interface.h
      - copied unchanged from r1317, /branches/indexer-split/src/trackerd/tracker-db-interface.h
Removed:
   branches/indexer-split/src/trackerd/tracker-db-interface-sqlite.c
   branches/indexer-split/src/trackerd/tracker-db-interface-sqlite.h
   branches/indexer-split/src/trackerd/tracker-db-interface.c
   branches/indexer-split/src/trackerd/tracker-db-interface.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/src/Makefile.am
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-db-sqlite.h
   branches/indexer-split/src/trackerd/tracker-dbus.h
   branches/indexer-split/src/trackerd/tracker-indexer.h

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Mon Apr 28 12:27:29 2008
@@ -816,15 +816,15 @@
 	thumbnailers/application/Makefile
 	thumbnailers/image/Makefile
 	src/Makefile
-	src/libstemmer/Makefile
 	src/qdbm/Makefile
 	src/text-filters/Makefile
 	src/text-filters/ooo_converter/Makefile
 	src/tracker-extract/Makefile
 	src/tracker-thumbnailer/Makefile
+	src/libstemmer/Makefile
 	src/libtracker-common/Makefile
-	src/trackerd/Makefile
 	src/libtracker/Makefile
+	src/libtracker-db/Makefile
 	src/libtracker-gtk/Makefile
 	src/tracker-indexer/Makefile
 	src/tracker-applet/Makefile
@@ -833,6 +833,7 @@
 	src/tracker-search-tool/tracker-search-tool.desktop.in
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in	
+	src/trackerd/Makefile
 	src/xdgmime/Makefile
 	po/Makefile.in
 	python/Makefile

Modified: branches/indexer-split/src/Makefile.am
==============================================================================
--- branches/indexer-split/src/Makefile.am	(original)
+++ branches/indexer-split/src/Makefile.am	Mon Apr 28 12:27:29 2008
@@ -18,5 +18,19 @@
 trackerapplet_dir = tracker-applet
 endif
 
-SUBDIRS = libstemmer xdgmime $(qdbm_dir) text-filters libtracker-common trackerd libtracker tracker-extract tracker-thumbnailer tracker-indexer $(libtrackergtk_dir) $(tracker_gui_dir) $(trackerapplet_dir) $(tracker_preferences_dir)
-
+SUBDIRS = 					\
+	libstemmer				\
+	xdgmime					\
+	$(qdbm_dir)				\
+	text-filters				\
+	libtracker-common 			\
+	libtracker-db				\
+	trackerd				\
+	libtracker				\
+	tracker-extract				\
+	tracker-thumbnailer			\
+	tracker-indexer				\
+	$(libtrackergtk_dir)			\
+	$(tracker_gui_dir)			\
+	$(trackerapplet_dir) 			\
+	$(tracker_preferences_dir)
\ No newline at end of file

Added: branches/indexer-split/src/libtracker-db/Makefile.am
==============================================================================
--- (empty file)
+++ branches/indexer-split/src/libtracker-db/Makefile.am	Mon Apr 28 12:27:29 2008
@@ -0,0 +1,24 @@
+INCLUDES =								\
+	-g						 		\
+	$(GLIB2_CFLAGS)							\
+	$(GMIME_CFLAGS)							\
+	$(SQLITE3_CFLAGS)						\
+	$(QDBM_CFLAGS)							\
+	-I$(top_srcdir)/src
+
+noinst_LTLIBRARIES = libtracker-db.la
+
+libtracker_db_la_SOURCES = 						\
+	tracker-db-interface.c						\
+	tracker-db-interface.h						\
+	tracker-db-interface-sqlite.c					\
+	tracker-db-interface-sqlite.h
+
+libtracker_db_la_LDFLAGS = -version-info 0:0:0
+libtracker_db_la_LIBADD = 						\
+	$(GLIB2_LIBS)							\
+	$(GMIME_LIBS)							\
+	$(SQLITE3_LIBS)							\
+	$(QDBM_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la
+

Copied: branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c (from r1317, /branches/indexer-split/src/trackerd/tracker-db-interface-sqlite.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-db-interface-sqlite.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c	Mon Apr 28 12:27:29 2008
@@ -453,7 +453,7 @@
 	/* Just panic if the number of arguments don't match */
 	g_assert (n_args != stmt_args);
 
-	return create_result_set_from_stmt (db_interface, stmt, error);
+	return create_result_set_from_stmt (TRACKER_DB_INTERFACE_SQLITE (db_interface), stmt, error);
 }
 
 static TrackerDBResultSet *
@@ -489,7 +489,7 @@
 	/* Just panic if the number of arguments don't match */
 	g_assert (n_args != stmt_args);
 
-	return create_result_set_from_stmt (db_interface, stmt, error);
+	return create_result_set_from_stmt (TRACKER_DB_INTERFACE_SQLITE (db_interface), stmt, error);
 }
 
 static TrackerDBResultSet *
@@ -513,7 +513,7 @@
 		return NULL;
 	}
 
-	result_set = create_result_set_from_stmt (db_interface, stmt, error);
+	result_set = create_result_set_from_stmt (TRACKER_DB_INTERFACE_SQLITE (db_interface), stmt, error);
 	sqlite3_finalize (stmt);
 
 	return result_set;

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Mon Apr 28 12:27:29 2008
@@ -51,10 +51,6 @@
 	tracker-cache.h							\
 	tracker-parser.c						\
 	tracker-parser.h						\
-	tracker-db-interface.c						\
-	tracker-db-interface.h						\
-	tracker-db-interface-sqlite.c					\
-	tracker-db-interface-sqlite.h					\
 	tracker-db-sqlite.c						\
 	tracker-db-sqlite.h						\
 	tracker-db-email.c						\
@@ -163,6 +159,7 @@
 	$(GTHREAD_LIBS)							\
 	-lz								\
 	-lm								\
+	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libstemmer/libstemmer-private.la 		\
 	$(top_builddir)/src/xdgmime/libxdgmime.la 			\

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	Mon Apr 28 12:27:29 2008
@@ -47,7 +47,8 @@
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-utils.h>
 
-#include "tracker-db-interface-sqlite.h"
+#include <libtracker-db/tracker-db-interface-sqlite.h>
+
 #include "tracker-db-sqlite.h"
 #include "tracker-indexer.h"
 #include "tracker-cache.h"

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	Mon Apr 28 12:27:29 2008
@@ -24,7 +24,8 @@
 
 #include <glib.h>
 
-#include "tracker-db-interface.h"
+#include <libtracker-db/tracker-db-interface.h>
+
 #include "tracker-utils.h"
 #include "tracker-service-manager.h"
 

Modified: branches/indexer-split/src/trackerd/tracker-dbus.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.h	Mon Apr 28 12:27:29 2008
@@ -32,7 +32,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
 
-#include "tracker-db-interface.h"
+#include <libtracker-db/tracker-db-interface.h>
 
 #define TRACKER_DBUS_ERROR_DOMAIN "TrackerDBus"
 #define TRACKER_DBUS_ERROR        tracker_dbus_error_quark()

Modified: branches/indexer-split/src/trackerd/tracker-indexer.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.h	Mon Apr 28 12:27:29 2008
@@ -22,11 +22,13 @@
 #ifndef _TRACKER_INDEXER_H
 #define _TRACKER_INDEXER_H
 
-
 #include <stdlib.h>
+
 #include <glib.h>
+
+#include <libtracker-db/tracker-db-interface.h>
+
 #include "tracker-utils.h"
-#include "tracker-db-interface.h"
 
 typedef struct {                         /* type of structure for an element of search result */
 	guint32 	id;              /* Service ID number of the document */