[tracker] TrackerMinerFS: Get rid of slash_uri in queries where we use tracker:uri-is-*()

[Martyn James Russell <mr src gnome org>]

commit 9dad159825ec6dddcb69f883971baff51b1161e2
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Apr 22 12:25:02 2010 +0200

    TrackerMinerFS: Get rid of slash_uri in queries where we use tracker:uri-is-*()
    
    This is already handled in these functions, so no need for that check in the miner.

 src/libtracker-miner/tracker-miner-fs.c |   35 +++++++-----------------------
 1 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 0251b48..e366041 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -1123,7 +1123,7 @@ static void
 ensure_iri_cache (TrackerMinerFS *fs,
                   GFile          *parent)
 {
-	gchar *query, *uri, *slash_uri;
+	gchar *query, *uri;
 	CacheQueryData data;
 
 	g_hash_table_remove_all (fs->private->iri_cache);
@@ -1132,18 +1132,12 @@ ensure_iri_cache (TrackerMinerFS *fs,
 
 	g_debug ("Generating IRI cache for folder: %s", uri);
 
-	if (g_str_has_suffix (uri, "/")) {
-		slash_uri = uri;
-	} else {
-		slash_uri = g_strconcat (uri, "/", NULL);
-		g_free (uri);
-	}
-
 	query = g_strdup_printf ("SELECT ?uri ?u { "
 	                         "  ?u nie:url ?uri . "
 	                         "  FILTER (tracker:uri-is-parent (\"%s\", ?uri)) "
 	                         "}",
-	                         slash_uri);
+	                         uri);
+	g_free (uri);
 
 	data.main_loop = g_main_loop_new (NULL, FALSE);
 	data.values = g_hash_table_ref (fs->private->iri_cache);
@@ -1158,8 +1152,6 @@ ensure_iri_cache (TrackerMinerFS *fs,
 
 	g_main_loop_unref (data.main_loop);
 	g_hash_table_unref (data.values);
-
-	g_free (slash_uri);
 }
 
 static const gchar *
@@ -1599,15 +1591,13 @@ item_update_children_uri (TrackerMinerFS    *fs,
                           const gchar       *source_uri,
                           const gchar       *uri)
 {
-	gchar *slash_uri, *sparql;
-
-	slash_uri = g_strconcat (source_uri, "/", NULL);
+	gchar *sparql;
 
 	sparql = g_strdup_printf ("SELECT ?child ?url nie:mimeType(?child) WHERE { "
 				  "  ?child nie:url ?url . "
                                   "  FILTER (tracker:uri-is-descendant (\"%s\", ?uri)) "
 				  "}",
-				  slash_uri);
+				  uri);
 
 	tracker_miner_execute_sparql (TRACKER_MINER (fs),
 	                              sparql,
@@ -1615,7 +1605,6 @@ item_update_children_uri (TrackerMinerFS    *fs,
 	                              item_update_children_uri_cb,
 	                              move_data);
 
-	g_free (slash_uri);
 	g_free (sparql);
 }
 
@@ -2169,7 +2158,7 @@ static void
 ensure_mtime_cache (TrackerMinerFS *fs,
                     GFile          *file)
 {
-	gchar *query, *uri, *slash_uri;
+	gchar *query, *uri;
 	CacheQueryData data;
 	GFile *parent;
 
@@ -2199,19 +2188,13 @@ ensure_mtime_cache (TrackerMinerFS *fs,
 
 	g_debug ("Generating mtime cache for folder: %s", uri);
 
-	if (g_str_has_suffix (uri, "/")) {
-		slash_uri = uri;
-	} else {
-		slash_uri = g_strconcat (uri, "/", NULL);
-		g_free (uri);
-	}
-
 	query = g_strdup_printf ("SELECT ?uri ?time { "
 	                         "  ?u nfo:fileLastModified ?time ; "
 	                         "     nie:url ?uri . "
 	                         "  FILTER (tracker:uri-is-parent (\"%s\", ?uri)) "
 	                         "}",
-	                         slash_uri);
+	                         uri);
+	g_free (uri);
 
 	data.main_loop = g_main_loop_new (NULL, FALSE);
 	data.values = g_hash_table_ref (fs->private->mtime_cache);
@@ -2226,8 +2209,6 @@ ensure_mtime_cache (TrackerMinerFS *fs,
 
 	g_main_loop_unref (data.main_loop);
 	g_hash_table_unref (data.values);
-
-	g_free (slash_uri);
 }
 
 static gboolean