tracker r2198 - in branches/indexer-split: . src src/libtracker-db tests tests/tracker-fts

[mr svn gnome org]

Author: mr
Date: Fri Sep  5 10:45:40 2008
New Revision: 2198
URL: http://svn.gnome.org/viewvc/tracker?rev=2198&view=rev

Log:
	* configure.ac: 
	* src/Makefile.am: Make Jamie's new tracker-fts/ directory disabled
	by default. Enabled with the --enable-sqlite-fts configure option.
	This breaks the build right now that's why it is disabled while it
	is under development. Also fixed make distcheck failures (tests
	still fail for some things).

	* src/libtracker-db/Makefile.am: Link with -lz so build doesn't fail.

	* tests/Makefile.am: Clean ups.

	* src/libtracker-db/tracker-db-index.c: (tracker_db_index_flush):
	Fixed build warnings.

	* tests/tracker-fts/Makefile.am: Fixed missing header file.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/src/Makefile.am
   branches/indexer-split/src/libtracker-db/Makefile.am
   branches/indexer-split/src/libtracker-db/tracker-db-index.c
   branches/indexer-split/tests/Makefile.am
   branches/indexer-split/tests/tracker-fts/Makefile.am

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Fri Sep  5 10:45:40 2008
@@ -469,6 +469,46 @@
 AC_SUBST(SQLITE3_LIBS)
 
 ##################################################################
+# Enable SQLite FTS support?
+##################################################################
+
+AC_ARG_ENABLE([sqlite_fts],
+              AS_HELP_STRING([--enable-sqlite-fts], [Enable SQLite FTS support]),,
+              [enable_sqlite_fts=no])
+
+if test "x$enable_sqlite_fts" == "xno" ; then
+   enable_sqlite_fts="no (disabled)"
+fi
+
+AM_CONDITIONAL(ENABLE_SQLITE_FTS, test "$enable_sqlite_fts" = "yes")
+
+##################################################################
+# Enable UNAC support?
+##################################################################
+
+AC_ARG_ENABLE([unac], 
+              AS_HELP_STRING([--disable-unac], [Disable unac accent stripper support]),,
+	      [enable_unac=yes])
+
+if test "x$enable_unac" != "xno" ; then
+   PKG_CHECK_MODULES(UNAC, 
+		     [unac >= 1.0.0],
+		     [enable_unac=yes],
+		     [enable_unac=no])
+
+   AC_SUBST([UNAC_CFLAGS])
+   AC_SUBST([UNAC_LIBS])
+else
+   enable_unac="no (disabled)"
+fi
+
+if test "$enable_unac" = "yes"; then
+   AC_DEFINE(HAVE_UNAC, [], [Define if we have unac lib])
+fi
+
+AM_CONDITIONAL(ENABLE_UNAC, test "$enable_unac" = "yes")
+
+##################################################################
 # Enable building libtracker-gtk?
 ##################################################################
 
@@ -532,32 +572,6 @@
 AM_CONDITIONAL(ENABLE_TRACKERAPPLET, test "$enable_trackerapplet" = "yes")
 
 ##################################################################
-# Enable UNAC support?
-##################################################################
-
-AC_ARG_ENABLE([unac], 
-              AS_HELP_STRING([--disable-unac], [Disable unac accent stripper support]),,
-	      [enable_unac=yes])
-
-if test "x$enable_unac" != "xno" ; then
-   PKG_CHECK_MODULES(UNAC, 
-		     [unac >= 1.0.0],
-		     [enable_unac=yes],
-		     [enable_unac=no])
-
-   AC_SUBST([UNAC_CFLAGS])
-   AC_SUBST([UNAC_LIBS])
-else
-   enable_unac="no (disabled)"
-fi
-
-if test "$enable_unac" = "yes"; then
-   AC_DEFINE(HAVE_UNAC, [], [Define if we have unac lib])
-fi
-
-AM_CONDITIONAL(ENABLE_UNAC, test "$enable_unac" = "yes")
-
-##################################################################
 # Check for GNOME/GTK dependencies to build tracker search tool
 ##################################################################
 
@@ -1002,8 +1016,8 @@
 	tests/scripts/Makefile
 	tests/trackerd/Makefile
 	tests/trackerd/xesam/Makefile
-	tests/tracker-indexer/Makefile
 	tests/tracker-fts/Makefile
+	tests/tracker-indexer/Makefile
 	thumbnailers/application/Makefile
 	thumbnailers/image/Makefile
 	thumbnailers/Makefile
@@ -1035,6 +1049,8 @@
 
 Applications:
 
+	Build with SQLite FTS support:		$enable_sqlite_fts
+
 	Build deskbar-applet:			$enable_deskbar_applet
 	Build tracker-search-tool:	        $have_gnome
 	Build tracker-preferences:		$enable_preferences

Modified: branches/indexer-split/src/Makefile.am
==============================================================================
--- branches/indexer-split/src/Makefile.am	(original)
+++ branches/indexer-split/src/Makefile.am	Fri Sep  5 10:45:40 2008
@@ -10,6 +10,10 @@
 build_qdbm = qdbm
 endif
 
+if ENABLE_SQLITE_FTS
+build_sqlite_fts = tracker-fts
+endif
+
 if ENABLE_PREFERENCES
 build_tracker_preferences = tracker-preferences
 endif
@@ -29,7 +33,7 @@
 	libtracker-common 			\
 	libtracker-db				\
 	libtracker				\
-	tracker-fts				\
+	$(build_sqlite_fts)			\
 	trackerd				\
 	tracker-utils				\
 	tracker-extract				\
@@ -47,6 +51,7 @@
 	libtracker-common 			\
 	libtracker-db				\
 	libtracker				\
+	tracker-fts				\
 	trackerd				\
 	tracker-utils				\
 	tracker-extract				\

Modified: branches/indexer-split/src/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-db/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker-db/Makefile.am	Fri Sep  5 10:45:40 2008
@@ -38,4 +38,5 @@
 	$(SQLITE3_LIBS)							\
 	$(QDBM_LIBS)							\
 	$(DBUS_LIBS)							\
-	$(GLIB2_LIBS)
\ No newline at end of file
+	$(GLIB2_LIBS)							\
+	-lz
\ No newline at end of file

Modified: branches/indexer-split/src/libtracker-db/tracker-db-index.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index.c	Fri Sep  5 10:45:40 2008
@@ -852,7 +852,8 @@
 	priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
 
 	if (priv->in_flush) {
-		return;
+		g_debug ("Index was already in the middle of a flush");
+		return 0;
 	}
 
 	if (!priv->index) {

Modified: branches/indexer-split/tests/Makefile.am
==============================================================================
--- branches/indexer-split/tests/Makefile.am	(original)
+++ branches/indexer-split/tests/Makefile.am	Fri Sep  5 10:45:40 2008
@@ -1,10 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = common \
-	libtracker-common \
-	trackerd \
-	scripts \
-	libtracker-db \
-	tracker-fts   \
+SUBDIRS = common 			\
+	libtracker-common		\
+	libtracker-db 			\
+	trackerd 			\
+	scripts 			\
+	tracker-fts   			\
 	tracker-indexer
 

Modified: branches/indexer-split/tests/tracker-fts/Makefile.am
==============================================================================
--- branches/indexer-split/tests/tracker-fts/Makefile.am	(original)
+++ branches/indexer-split/tests/tracker-fts/Makefile.am	Fri Sep  5 10:45:40 2008
@@ -4,18 +4,17 @@
 
 TEST_PROGS += tracker-fts-test
 
-INCLUDES = 				\
-	-DG_LOG_DOMAIN=\"Tracker\"	\
-	-I$(top_srcdir)/src		\
-	$(SQLITE3_CFLAGS)		\
-	$(GTHREAD_CFLAGS)		\
-	$(PANGO_CFLAGS)			\
+INCLUDES = 								\
+	-DG_LOG_DOMAIN=\"Tracker\"					\
+	-I$(top_srcdir)/src						\
+	$(SQLITE3_CFLAGS)						\
+	$(GTHREAD_CFLAGS)						\
+	$(PANGO_CFLAGS)							\
 	$(GLIB2_CFLAGS)
 
 
 tracker_fts_test_SOURCES =						\
-	tracker-fts-test.c						\
-	tracker-fts-test.h						
+	tracker-fts-test.c
 
 tracker_fts_test_LDADD =						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\