[tracker/miner-fs-refactor: 35/93] libtracker-miner: Fix double inserts in tracker_file_system_get_file()

[Carlos Garnacho <carlosg src gnome org>]

commit ea9bdb03dcf6d225fe49c7aa1e72626383265600
Author: Carlos Garnacho <carlos lanedo com>
Date:   Wed Sep 28 17:41:45 2011 +0200

    libtracker-miner: Fix double inserts in tracker_file_system_get_file()
    
    If parent was provided, no check for duplicates was done.

 src/libtracker-miner/tracker-file-system.c |   37 ++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-file-system.c b/src/libtracker-miner/tracker-file-system.c
index 5670380..8008fc4 100644
--- a/src/libtracker-miner/tracker-file-system.c
+++ b/src/libtracker-miner/tracker-file-system.c
@@ -321,7 +321,7 @@ tracker_file_system_get_file (TrackerFileSystem *file_system,
 	TrackerFileSystemPrivate *priv;
 	FileNodeData *data;
 	GNode *node, *parent_node;
-	gchar *uri_suffix;
+	gchar *uri_suffix = NULL;
 
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 	g_return_val_if_fail (TRACKER_IS_FILE_SYSTEM (file_system), NULL);
@@ -331,10 +331,43 @@ tracker_file_system_get_file (TrackerFileSystem *file_system,
 
 	if (parent) {
 		FileNodeData *parent_data;
+		GNode *child;
 
 		parent_node = (GNode *) parent;
 		parent_data = parent_node->data;
-		uri_suffix = g_file_get_relative_path (parent_data->file, file);
+
+		/* Find child node, if any */
+		for (child = g_node_first_child (parent_node);
+		     child != NULL;
+		     child = g_node_next_sibling (child)) {
+			FileNodeData *child_data;
+
+			child_data = child->data;
+
+			if (g_file_equal (child_data->file, file)) {
+				node = child;
+				break;
+			}
+		}
+
+		if (!node) {
+			gchar *uri, *parent_uri;
+			const gchar *ptr;
+			gint len;
+
+			uri = g_file_get_uri (file);
+			parent_uri = g_file_get_uri (parent_data->file);
+			len = strlen (parent_uri);
+
+			ptr = uri + len;
+			g_assert (ptr[0] == '/');
+
+			ptr++;
+			uri_suffix = g_strdup (ptr);
+
+			g_free (parent_uri);
+			g_free (uri);
+		}
 	} else {
 		node = file_tree_lookup (priv->file_tree, file,
 					 &parent_node, &uri_suffix);