tracker r2719 - in trunk: . src/libtracker-common src/libtracker-data src/trackerd

[mr svn gnome org]

Author: mr
Date: Tue Dec 16 19:01:41 2008
New Revision: 2719
URL: http://svn.gnome.org/viewvc/tracker?rev=2719&view=rev

Log:
	* src/libtracker-common/tracker-config.c:
	* src/libtracker-common/tracker-hal.c: 
	* src/libtracker-common/tracker-thumbnailer.[ch]:
	* src/libtracker-common/tracker-type-utils.c:
	* src/libtracker-data/tracker-data-metadata.c:
	* src/libtracker-data/tracker-data-query.c:
	* src/libtracker-data/tracker-data-update.c:
	* src/libtracker-data/tracker-rdf-query.c:
	* src/trackerd/tracker-search.c: Fixed a bunch of warnings now we
	have more compiler flags to catch these things.


Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-config.c
   trunk/src/libtracker-common/tracker-hal.c
   trunk/src/libtracker-common/tracker-thumbnailer.c
   trunk/src/libtracker-common/tracker-thumbnailer.h
   trunk/src/libtracker-common/tracker-type-utils.c
   trunk/src/libtracker-data/tracker-data-metadata.c
   trunk/src/libtracker-data/tracker-data-query.c
   trunk/src/libtracker-data/tracker-data-update.c
   trunk/src/libtracker-data/tracker-rdf-query.c
   trunk/src/trackerd/tracker-search.c

Modified: trunk/src/libtracker-common/tracker-config.c
==============================================================================
--- trunk/src/libtracker-common/tracker-config.c	(original)
+++ trunk/src/libtracker-common/tracker-config.c	Tue Dec 16 19:01:41 2008
@@ -1437,7 +1437,6 @@
 		g_warning ("Could not write %" G_GSIZE_FORMAT " bytes to file '%s', %s",
 			   size,
 			   filename,
-			   "%s",
 			   error->message);
 		g_free (filename);
 		g_error_free (error);

Modified: trunk/src/libtracker-common/tracker-hal.c
==============================================================================
--- trunk/src/libtracker-common/tracker-hal.c	(original)
+++ trunk/src/libtracker-common/tracker-hal.c	Tue Dec 16 19:01:41 2008
@@ -538,9 +538,7 @@
 			const gchar *udi)
 {
 	TrackerHalPriv *priv;
-	LibHalVolume   *volume;
 	const gchar    *mount_point;
-	const gchar    *volume_uuid;
 
 	priv = GET_PRIV (hal);
 
@@ -1277,7 +1275,7 @@
 		g_message ("HAL device with udi:'%s' has no volume, "
 			   "should we delete?",
 			   udi);
-		return;
+		return FALSE;
 	}
 
 	mount_point = libhal_volume_get_mount_point (volume);

Modified: trunk/src/libtracker-common/tracker-thumbnailer.c
==============================================================================
--- trunk/src/libtracker-common/tracker-thumbnailer.c	(original)
+++ trunk/src/libtracker-common/tracker-thumbnailer.c	Tue Dec 16 19:01:41 2008
@@ -29,6 +29,7 @@
 
 #include "tracker-config.h"
 #include "tracker-dbus.h"
+#include "tracker-thumbnailer.h"
 
 #define THUMBNAILER_SERVICE	 "org.freedesktop.thumbnailer"
 #define THUMBNAILER_PATH	 "/org/freedesktop/thumbnailer/Generic"

Modified: trunk/src/libtracker-common/tracker-thumbnailer.h
==============================================================================
--- trunk/src/libtracker-common/tracker-thumbnailer.h	(original)
+++ trunk/src/libtracker-common/tracker-thumbnailer.h	Tue Dec 16 19:01:41 2008
@@ -22,7 +22,7 @@
 #ifndef __TRACKER_THUMBNAILER_H__
 #define __TRACKER_THUMBNAILER_H__
 
-#include "tracker-config.h"
+#include <libtracker-common/tracker-config.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/libtracker-common/tracker-type-utils.c
==============================================================================
--- trunk/src/libtracker-common/tracker-type-utils.c	(original)
+++ trunk/src/libtracker-common/tracker-type-utils.c	Tue Dec 16 19:01:41 2008
@@ -21,6 +21,10 @@
 
 #include "config.h"
 
+#define _XOPEN_SOURCE
+#include <time.h>
+
+#include <strings.h>
 #include <string.h>
 #include <stdlib.h>
 

Modified: trunk/src/libtracker-data/tracker-data-metadata.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-metadata.c	(original)
+++ trunk/src/libtracker-data/tracker-data-metadata.c	Tue Dec 16 19:01:41 2008
@@ -193,8 +193,8 @@
 {
 	TrackerField *field;
 
-	g_return_if_fail (metadata != NULL);
-	g_return_if_fail (field_name != NULL);
+	g_return_val_if_fail (metadata != NULL, NULL);
+	g_return_val_if_fail (field_name != NULL, NULL);
 
 	field = tracker_ontology_get_field_by_name (field_name);
 
@@ -222,8 +222,8 @@
 {
 	TrackerField *field;
 
-	g_return_if_fail (metadata != NULL);
-	g_return_if_fail (field_name != NULL);
+	g_return_val_if_fail (metadata != NULL, NULL);
+	g_return_val_if_fail (field_name != NULL, NULL);
 
 	field = tracker_ontology_get_field_by_name (field_name);
 

Modified: trunk/src/libtracker-data/tracker-data-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-query.c	(original)
+++ trunk/src/libtracker-data/tracker-data-query.c	Tue Dec 16 19:01:41 2008
@@ -51,8 +51,8 @@
 	const gchar  *proc = NULL;
 
 	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-	g_return_val_if_fail (id, NULL);
-	g_return_val_if_fail (field, NULL);
+	g_return_val_if_fail (id != NULL, NULL);
+	g_return_val_if_fail (field != NULL, NULL);
 
 	def = tracker_ontology_get_field_by_name (field);
 
@@ -153,7 +153,6 @@
 
 }
 
-
 TrackerDBResultSet *
 tracker_data_query_metadata_fields (TrackerDBInterface *iface,
 				    const gchar	       *service_type,
@@ -223,7 +222,6 @@
 	return result_set;
 }
 
-
 /*
  * Obtain the concrete service type name for the file id.
  */
@@ -253,10 +251,9 @@
 	return result;
 }
 
-
 guint32
-tracker_data_query_file_id (const gchar    *service_type,
-			    const gchar	   *path)
+tracker_data_query_file_id (const gchar *service_type,
+			    const gchar *path)
 {
 	TrackerDBResultSet *result_set;
 	TrackerDBInterface *iface;
@@ -395,7 +392,6 @@
 			gboolean	     embedded)
 {
 	TrackerField *field;
-	gint	      numeric_value;
 	gint	      metadata_id;
 	gboolean      valid = TRUE;
 
@@ -500,7 +496,6 @@
 {
 	TrackerDBInterface *iface;
 	TrackerDBResultSet *result_set;
-	GHashTable          *results;
 
 	g_return_val_if_fail (TRACKER_IS_SERVICE (service), NULL);
 

Modified: trunk/src/libtracker-data/tracker-data-update.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-update.c	(original)
+++ trunk/src/libtracker-data/tracker-data-update.c	Tue Dec 16 19:01:41 2008
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <stdlib.h>
 
 #include <libtracker-common/tracker-type-utils.h>
@@ -32,6 +33,7 @@
 
 #include "tracker-data-manager.h"
 #include "tracker-data-update.h"
+#include "tracker-data-query.h"
 
 typedef struct {
 	TrackerService *service;
@@ -575,8 +577,6 @@
 	tracker_data_manager_exec (iface, "DELETE FROM Events WHERE BeingHandled = 1");
 }
 
-/* TODO: URI branch path -> uri */
-
 void
 tracker_data_update_delete_service_by_path (const gchar *path,
 					    const gchar *rdf_type)
@@ -592,11 +592,11 @@
 
 	service = tracker_ontology_get_service_by_name (rdf_type);
 	service_type = tracker_service_get_name (service);
-	service_id =  tracker_data_query_file_id (service_type, path);
+	service_id = tracker_data_query_file_id (service_type, path);
 
 	/* When merging from the decomposed branch to trunk then this function
-	 * wont exist in the decomposed branch. Create it based on this one. */
-
+	 * wont exist in the decomposed branch. Create it based on this one. 
+	 */
 	if (service_id != 0) {
 		tracker_data_update_delete_service (service, service_id);
 		if (strcmp (service_type, "Folders") == 0) {
@@ -606,8 +606,6 @@
 	}
 }
 
-/* TODO: URI branch path -> uri */
-
 static void
 set_metadata (TrackerField *field, 
 	      gpointer value, 
@@ -622,8 +620,8 @@
 
 	/* TODO untested and unfinished port that came from the decomposed 
 	 * branch of JÃrg. When merging from the decomposed branch to trunk
-	 * then pick the version in the decomposed branch for this function */
-
+	 * then pick the version in the decomposed branch for this function 
+	 */
 	parsed_value = tracker_parser_text_to_string (value,
 						      info->language,
 						      tracker_config_get_max_word_length (info->config),
@@ -654,7 +652,6 @@
 
 	g_free (parsed_value);
 	g_strfreev (arr);
-
 }
 
 static void
@@ -662,11 +659,11 @@
 				  gpointer   value,
 				  gpointer   user_data)
 {
-	ForeachInMetadataInfo *info = user_data;
-	gchar *parsed_value;
-	gint throttle;
 	TrackerField *field;
+	ForeachInMetadataInfo *info;
+	gint throttle;
 
+	info = user_data;
 	field = tracker_ontology_get_field_by_name (predicate);
 
 	if (!field)
@@ -682,13 +679,12 @@
 		set_metadata (field, value, user_data);
 	} else {
 		GList *list;
+
 		for (list = value; list; list = list->next)
 			set_metadata (field, list->data, user_data);
 	}
 }
 
-/* TODO: URI branch path -> uri */
-
 void 
 tracker_data_update_replace_service (const gchar *path,
 				     const gchar *rdf_type,
@@ -711,7 +707,8 @@
 	 * compare the features, as this version is more recent and has 
 	 * implemented a few significant items, whereas the version in the
 	 * decomposed branch was a proof of concept implementation, and might
-	 * not have these needed features. */
+	 * not have these needed features. 
+	 */
 
 	if (!rdf_type)
 		return;
@@ -776,7 +773,6 @@
 		g_value_unset (&is_value);
 
 		g_object_unref (result_set);
-
 	} else {
 		guint32     id;
 
@@ -801,7 +797,6 @@
 
 			g_slice_free (ForeachInMetadataInfo, info);
 		}
-
 	}
 
 	g_free (dirname);

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Tue Dec 16 19:01:41 2008
@@ -1260,7 +1260,7 @@
 			for (l = list; l; l = l->next) {
 				g_string_append_printf (data.sql_from,
 							" AND S.ID IN (SELECT ServiceID FROM ServiceKeywordMetaData WHERE MetadataValue = '%s')",
-							l->data);
+							(gchar*) l->data);
 			}
 
 			g_list_foreach(list, (GFunc)g_free, NULL);

Modified: trunk/src/trackerd/tracker-search.c
==============================================================================
--- trunk/src/trackerd/tracker-search.c	(original)
+++ trunk/src/trackerd/tracker-search.c	Tue Dec 16 19:01:41 2008
@@ -1049,7 +1049,7 @@
 					       service, 
 					       fields,
 					       "", 
-					       "", 
+					       NULL, 
 					       query_condition,
 					       FALSE,
 					       NULL,