tracker r2026 - in branches/indexer-split: . src/libtracker-db src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2026 - in branches/indexer-split: . src/libtracker-db src/trackerd
- Date: Thu, 7 Aug 2008 11:41:11 +0000 (UTC)
Author: mr
Date: Thu Aug 7 11:41:10 2008
New Revision: 2026
URL: http://svn.gnome.org/viewvc/tracker?rev=2026&view=rev
Log:
* src/libtracker-db/Makefile.am: Make sure we compile with debug
symbols for gdb.
* src/libtracker-db/tracker-db-index.c: (tracker_db_index_open):
Don't set priv->reload incorrectly, this meant we wouldn't get
stats because we thought we couldn't open the file. This means
t-s-t is now working again.
* src/trackerd/tracker-query-tree.c: Use TRACKER_IS_LANGUAGE for
TrackerLanguage now it is a GObject.
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/libtracker-db/Makefile.am
branches/indexer-split/src/libtracker-db/tracker-db-index.c
branches/indexer-split/src/trackerd/tracker-query-tree.c
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 Thu Aug 7 11:41:10 2008
@@ -1,4 +1,5 @@
INCLUDES = \
+ -g \
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
-I$(top_srcdir)/src \
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 Thu Aug 7 11:41:10 2008
@@ -700,7 +700,6 @@
gint flags;
gint bucket_count;
gint rec_count;
- gboolean retval = FALSE;
g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), FALSE);
@@ -710,7 +709,9 @@
g_mutex_lock (priv->mutex);
- g_debug ("Opening index:'%s'", priv->filename);
+ g_debug ("Opening index:'%s' (%s)",
+ priv->filename,
+ priv->readonly ? "readonly" : "read/write");
if (priv->readonly) {
flags = DP_OREADER | DP_ONOLCK;
@@ -752,15 +753,13 @@
rec_count);
priv->reload = FALSE;
-
- retval = TRUE;
+ } else {
+ priv->reload = TRUE;
}
-
- priv->reload = TRUE;
g_mutex_unlock (priv->mutex);
- return retval;
+ return !priv->reload;
}
gboolean
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 Thu Aug 7 11:41:10 2008
@@ -286,7 +286,7 @@
g_return_val_if_fail (query_str != NULL, NULL);
g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), NULL);
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
- g_return_val_if_fail (language != NULL, NULL);
+ g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
/* NOTE: The "query" has to come AFTER the "config" and
* "language" properties since setting the query actually
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]