tracker r2676 - in trunk: . src/tracker-utils

[ifrade svn gnome org]

Author: ifrade
Date: Mon Dec  8 17:34:03 2008
New Revision: 2676
URL: http://svn.gnome.org/viewvc/tracker?rev=2676&view=rev

Log:
Now the tools can receive relative paths as parameters

Modified:
   trunk/ChangeLog
   trunk/src/tracker-utils/tracker-info.c
   trunk/src/tracker-utils/tracker-meta-folder.c
   trunk/src/tracker-utils/tracker-query.c
   trunk/src/tracker-utils/tracker-tag.c

Modified: trunk/src/tracker-utils/tracker-info.c
==============================================================================
--- trunk/src/tracker-utils/tracker-info.c	(original)
+++ trunk/src/tracker-utils/tracker-info.c	Mon Dec  8 17:34:03 2008
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <libtracker/tracker.h>
 
@@ -61,6 +62,8 @@
 {
 	TrackerClient	*client;
 	ServiceType	 type;
+	GFile           *file;
+	gchar           *abs_path;
 	GOptionContext	*context;
 	GError		*error = NULL;
 	GPtrArray	*results;
@@ -118,10 +121,16 @@
 		}
 	}
 
+	file = g_file_new_for_commandline_arg (uri[0]);
+	abs_path = g_file_get_path (file);
+
 	results = tracker_metadata_get_all (client,
 					    type,
-					    uri[0],
+					    abs_path,
 					    &error);
+	g_free (abs_path);
+	g_object_unref (file);
+	
 	if (error) {
 		g_printerr ("%s, %s\n",
 			    _("Unable to retrieve data for uri"),

Modified: trunk/src/tracker-utils/tracker-meta-folder.c
==============================================================================
--- trunk/src/tracker-utils/tracker-meta-folder.c	(original)
+++ trunk/src/tracker-utils/tracker-meta-folder.c	Mon Dec  8 17:34:03 2008
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <libtracker/tracker.h>
 
@@ -138,10 +139,11 @@
 	TrackerClient	*client;
 	GOptionContext	*context;
 	GError		*error = NULL;
+	GFile           *file;
 	gchar		*summary;
 	const gchar	*failed = NULL;
 	gchar	       **fields_resolved = NULL;
-	gchar		*path_in_utf8;
+	gchar		*path_in_utf8, *abs_path;
 	GPtrArray	*array;
 	gint		 i, j;
 
@@ -225,13 +227,18 @@
 		return EXIT_FAILURE;
 	}
 
+	file = g_file_new_for_commandline_arg (path_in_utf8);
+	abs_path = g_file_get_path (file);
+
 	array = tracker_files_get_metadata_for_files_in_folder (client,
 								time (NULL),
-								path_in_utf8,
+								abs_path,
 								fields_resolved,
 								&error);
 
 	g_free (path_in_utf8);
+	g_free (abs_path);
+	g_object_unref (file);
 
 	if (error) {
 		g_printerr ("%s:'%s', %s\n",

Modified: trunk/src/tracker-utils/tracker-query.c
==============================================================================
--- trunk/src/tracker-utils/tracker-query.c	(original)
+++ trunk/src/tracker-utils/tracker-query.c	Mon Dec  8 17:34:03 2008
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <libtracker/tracker.h>
 
@@ -103,7 +104,8 @@
 	ServiceType	 type;
 	GOptionContext	*context;
 	GError		*error = NULL;
-	gchar		*path_in_utf8;
+	GFile           *file;
+	gchar		*path_in_utf8, *abs_path;
 	gchar		*content;
 	gchar		*buffer;
 	gsize		 size;
@@ -175,20 +177,27 @@
 		return EXIT_FAILURE;
 	}
 
-	g_file_get_contents (path_in_utf8, &content, &size, &error);
+	file = g_file_new_for_commandline_arg (path_in_utf8);
+	abs_path = g_file_get_path (file);
+
+	g_file_get_contents (abs_path, &content, &size, &error);
 	if (error) {
 		g_printerr ("%s:'%s', %s\n",
 			    _("Could not read file"),
-			    path_in_utf8,
+			    abs_path,
 			    error->message);
 		g_error_free (error);
 		g_free (path_in_utf8);
+		g_free (abs_path);
+		g_object_unref (file);
 		tracker_disconnect (client);
 
 		return EXIT_FAILURE;
 	}
 
 	g_free (path_in_utf8);
+	g_free (abs_path);
+	g_object_unref (file);
 
 	buffer = g_locale_to_utf8 (content, size, NULL, NULL, &error);
 	g_free (content);

Modified: trunk/src/tracker-utils/tracker-tag.c
==============================================================================
--- trunk/src/tracker-utils/tracker-tag.c	(original)
+++ trunk/src/tracker-utils/tracker-tag.c	Mon Dec  8 17:34:03 2008
@@ -179,14 +179,13 @@
 		files_resolved = g_new0 (gchar*, g_strv_length (files) + 1);
 
 		for (i = 0, j = 0; files[i] != NULL; i++) {
-			/* GFile *file; */
-			/* gchar *path; */
+			GFile *file;
 
-			/* file = g_file_new_for_commandline_arg (files[i]); */
-			/* path = g_file_get_path (file); */
-			/* g_object_unref (file); */
+			file = g_file_new_for_commandline_arg (files[i]);
 
-			files_resolved[j++] = g_strdup (files[i]);
+			files_resolved[j++] = g_file_get_path (file); 
+
+			g_object_unref (file);
 		}
 
 		files_resolved[j] = NULL;