Re: [Tracker] Issues with current trunk
Martyn Russell wrote: Michael Biebl wrote: 15.) tracker.cfg: Changing Verbosity has no effect. The command line switch -v seems to work though. So it isn't changing the tracker.cfg setting? The command line tends to overwrite the config file. My mistake, I thought you could change this in the tracker-preferences. It seems not :) Last time I changed my .cfg file it worked for me. So perhaps the preferences application is not working here. I just tested this and it works perfectly. Did you mean changing it in real time? If so, then that indeed doesn't work. -- Regards, Martyn ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
Re: [Tracker] patch to make trunk build with sun compiler
Hi, Martyn, I build trunk today on solaris, still failed when compile src/libtracker/tracker.c __FUNCTION__ is not defined. Hi Jerry, I think the #define should be put in tracker-os-dependent.h. I also don't think we should be defining the same thing more than once. Plus, are those extra includes actually needed to build? I will draft up a patch at some point and commit it later on. If you could test your build when it is committed that would be great! ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
Re: [Tracker] Issues with current trunk
Hi, It looks like the tracker directory is created in the directory where you start tracker. I do my tests with ./src/trackerd/trackerd and i have an empty ./tracker. Ivan On Thu, Dec 4, 2008 at 11:17 AM, Martyn Russell [EMAIL PROTECTED] wrote: Michael Biebl wrote: 2008/12/3 Martyn Russell [EMAIL PROTECTED]: Michael Biebl wrote: 18.) An empty directory ~/tracker is created by trackerd or tracker-indexer. It is? In order to reproduce this, you either have to start with a fresh user account or rm -rf ~/.config/tracker and restart trackerd Hmm, interestingly, I can't reproduce this. But I did have the ~/tracker directory yesterday after reading your mail about it. I wonder if it is related to some XDG directory settings / environment set up. Are you able to pin point it to the indexer or the daemon at all (by running the indexer independently) ? Either that or could you perhaps try running the daemon/indexer in gdb and setting a break point on mkdir to see where in the source it occurs? -- Regards, Martyn ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
[Tracker] Merging Turtle branch to Trunk
This is the latest merge-patch for Turtle to Trunk.
Please review
--
Philip Van Hoof, freelance software developer
home: me at pvanhoof dot be
gnome: pvanhoof at gnome dot org
http://pvanhoof.be/blog
http://codeminded.be
Index: src/tracker-indexer/tracker-main.c
===
--- src/tracker-indexer/tracker-main.c (revision 2649)
+++ src/tracker-indexer/tracker-main.c (working copy)
@@ -43,7 +43,9 @@
#include libtracker-db/tracker-db-index-manager.h
#include libtracker-data/tracker-data-update.h
+#include libtracker-data/tracker-turtle.h
+
#include tracker-dbus.h
#include tracker-indexer.h
@@ -370,13 +372,18 @@
tracker_indexer_process_modules (indexer, modules);
}
+ tracker_turtle_init ();
+
g_message (Starting...);
+
main_loop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (main_loop);
g_message (Shutdown started);
+ tracker_turtle_shutdown ();
+
if (quit_timeout_id) {
g_source_remove (quit_timeout_id);
}
Index: src/tracker-indexer/tracker-indexer.c
===
--- src/tracker-indexer/tracker-indexer.c (revision 2649)
+++ src/tracker-indexer/tracker-indexer.c (working copy)
@@ -71,10 +71,12 @@
#include libtracker-data/tracker-data-query.h
#include libtracker-data/tracker-data-update.h
+#include libtracker-data/tracker-turtle.h
#include tracker-indexer.h
#include tracker-indexer-module.h
#include tracker-marshal.h
+#include tracker-removable-device.h
#define TRACKER_INDEXER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_INDEXER, TrackerIndexerPrivate))
@@ -84,9 +86,6 @@
#define LOW_DISK_CHECK_FREQUENCY10
#define SIGNAL_STATUS_FREQUENCY 10
-/* Transaction every 'x' items */
-#define TRANSACTION_MAX 2000
-
/* Throttle defaults */
#define THROTTLE_DEFAULT 0
#define THROTTLE_DEFAULT_ON_BATTERY 5
@@ -384,6 +383,22 @@
indexer);
}
+
+void
+tracker_indexer_commit_transaction (TrackerIndexer *indexer)
+{
+ stop_transaction (indexer);
+ tracker_indexer_set_running (indexer, TRUE);
+
+}
+
+void
+tracker_indexer_open_transaction (TrackerIndexer *indexer)
+{
+ tracker_indexer_set_running (indexer, FALSE);
+ start_transaction (indexer);
+}
+
#ifdef HAVE_HAL
static void
@@ -1376,6 +1391,8 @@
TrackerService *service;
gchar *text;
guint32 id;
+ gchar *mount_point = NULL;
+ gchar *service_path;
service = get_service_for_file (info-module_file, info-module);
@@ -1413,6 +1430,29 @@
index_metadata (indexer, id, service, metadata);
+ /* TODO: URI branch path - uri */
+
+ service_path = g_build_path (G_DIR_SEPARATOR_S,
+ dirname,
+ basename,
+ NULL);
+
+ if (tracker_hal_path_is_on_removable_device (indexer-private-hal,
+ service_path,
+ mount_point,
+ NULL)) {
+
+ tracker_removable_device_add_metadata (indexer,
+ mount_point,
+ service_path,
+ tracker_service_get_name (service),
+ metadata);
+ }
+
+ g_free (mount_point);
+ mount_point = NULL;
+ g_free (service_path);
+
/* Take the old text - the new one, calculate
* difference and add the words.
*/
@@ -1446,6 +1486,29 @@
index_metadata (indexer, id, service, metadata);
+ /* TODO: URI branch path - uri */
+
+ service_path = g_build_path (G_DIR_SEPARATOR_S,
+ dirname,
+ basename,
+ NULL);
+
+ if (tracker_hal_path_is_on_removable_device (indexer-private-hal,
+ service_path,
+ mount_point,
+ NULL)) {
+
+ tracker_removable_device_add_metadata (indexer,
+ mount_point,
+ service_path,
+ tracker_service_get_name (service),
+ metadata);
+ }
+
+ g_free (mount_point);
+ mount_point = NULL;
+ g_free (service_path);
+
text = tracker_module_file_get_text (info-module_file);
if (text) {
@@ -1486,6 +1549,7 @@
GFile *file, *other_file;
gchar *path, *other_path;
gchar *uri, *other_uri, *mime_type;
+ gchar *mount_point = NULL;
guint32 id;
service = get_service_for_file (info-other_module_file, info-module);
@@ -1528,6 +1592,32 @@
tracker_data_update_move_service (service, path, other_path);
+ if (tracker_hal_path_is_on_removable_device (indexer-private-hal,
+ path,
+ mount_point,
+ NULL) ) {
+
+ if (tracker_hal_path_is_on_removable_device (indexer-private-hal,
+ other_path,
+ NULL,
+ NULL) ) {
+
+ tracker_removable_device_add_move (indexer,
+ mount_point,
+ path,
+ other_path,
+ tracker_service_get_name (service));
+
+ } else {
+ tracker_removable_device_add_removal (indexer,
+ mount_point,
+ path,
+ tracker_service_get_name (service));
+ }
+ }
+
+ g_free (mount_point);
+
/*
* Updating what changes in move
Re: [Tracker] patch to make trunk build with sun compiler
Jerry Tan wrote: Hi, Martyn, I build trunk today on solaris, still failed when compile src/libtracker/tracker.c __FUNCTION__ is not defined. Hi, Yes, config.h wasn't included in tracker.c that's why. I checked all other places in the code we use __FUNCTION__ and covered them all. So now it should work. To make sure, it should be defined in your config.h in the top level directory. -- Regards, Martyn ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
Re: [Tracker] Issues with current trunk
2008/12/4 Martyn Russell [EMAIL PROTECTED]: Michael Biebl wrote: 2008/12/3 Martyn Russell [EMAIL PROTECTED]: Michael Biebl wrote: 18.) An empty directory ~/tracker is created by trackerd or tracker-indexer. It is? In order to reproduce this, you either have to start with a fresh user account or rm -rf ~/.config/tracker and restart trackerd Hmm, interestingly, I can't reproduce this. But I did have the ~/tracker directory yesterday after reading your mail about it. I wonder if it is related to some XDG directory settings / environment set up. Are you able to pin point it to the indexer or the daemon at all (by running the indexer independently) ? Either that or could you perhaps try running the daemon/indexer in gdb and setting a break point on mkdir to see where in the source it occurs? I can reliably reproduce this, but only if trackerd is started by the gnome session manager. If the desktop session is started and I run trackerd in gdb, I can't reproduce it. This I think affirms your assumption, that is is related to XDG directory settings. ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
Re: [Tracker] Issues with current trunk
Hi, Unable to reproduce it here (in an Ubuntu intrepid). You can add some g_debug in src/trackerd/tracker-main.c:initialize_locations function to check the values of the XDG variables (we use the glib function to get those values). Thanks, Ivan On Thu, Dec 4, 2008 at 11:09 PM, Michael Biebl [EMAIL PROTECTED] wrote: 2008/12/4 Martyn Russell [EMAIL PROTECTED]: Michael Biebl wrote: 2008/12/3 Martyn Russell [EMAIL PROTECTED]: Michael Biebl wrote: 18.) An empty directory ~/tracker is created by trackerd or tracker-indexer. It is? In order to reproduce this, you either have to start with a fresh user account or rm -rf ~/.config/tracker and restart trackerd Hmm, interestingly, I can't reproduce this. But I did have the ~/tracker directory yesterday after reading your mail about it. I wonder if it is related to some XDG directory settings / environment set up. Are you able to pin point it to the indexer or the daemon at all (by running the indexer independently) ? Either that or could you perhaps try running the daemon/indexer in gdb and setting a break point on mkdir to see where in the source it occurs? I can reliably reproduce this, but only if trackerd is started by the gnome session manager. If the desktop session is started and I run trackerd in gdb, I can't reproduce it. This I think affirms your assumption, that is is related to XDG directory settings. ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list ___ tracker-list mailing list tracker-list@gnome.org http://mail.gnome.org/mailman/listinfo/tracker-list
