tracker r2707 - in branches/turtle: . src/libtracker-common src/libtracker-data src/tracker-indexer src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Tue Dec 16 13:36:02 2008
New Revision: 2707
URL: http://svn.gnome.org/viewvc/tracker?rev=2707&view=rev

Log:
2008-12-16  Philip Van Hoof  <philip codeminded be>

	* src/tracker-indexer/tracker-removable-device.c
	* src/tracker-indexer/tracker-indexer.c
	* src/libtracker-data/tracker-turtle.h
	* src/libtracker-data/tracker-data-metadata.c
	* src/libtracker-data/tracker-data-update.c
	* src/libtracker-data/tracker-data-update.h
	* src/trackerd/tracker-main.c
	* src/libtracker-common/tracker-hal.c: Fixed comments from martyn



Modified:
   branches/turtle/ChangeLog
   branches/turtle/src/libtracker-common/tracker-hal.c
   branches/turtle/src/libtracker-data/tracker-data-metadata.c
   branches/turtle/src/libtracker-data/tracker-data-update.c
   branches/turtle/src/libtracker-data/tracker-data-update.h
   branches/turtle/src/libtracker-data/tracker-turtle.h
   branches/turtle/src/tracker-indexer/tracker-indexer.c
   branches/turtle/src/tracker-indexer/tracker-removable-device.c
   branches/turtle/src/trackerd/tracker-main.c

Modified: branches/turtle/src/libtracker-common/tracker-hal.c
==============================================================================
--- branches/turtle/src/libtracker-common/tracker-hal.c	(original)
+++ branches/turtle/src/libtracker-common/tracker-hal.c	Tue Dec 16 13:36:02 2008
@@ -1195,6 +1195,8 @@
 
 				if (available)
 					*available = libhal_volume_is_mounted (volume);
+
+				libhal_volume_free (volume);
 				break;
 			}
 		}

Modified: branches/turtle/src/libtracker-data/tracker-data-metadata.c
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-data-metadata.c	(original)
+++ branches/turtle/src/libtracker-data/tracker-data-metadata.c	Tue Dec 16 13:36:02 2008
@@ -161,8 +161,6 @@
 		return;
 	}
 
-	field = tracker_ontology_get_field_by_name (field_name);
-
 	g_return_if_fail (TRACKER_IS_FIELD (field));
 	g_return_if_fail (tracker_field_get_multiple_values (field) == TRUE);
 

Modified: branches/turtle/src/libtracker-data/tracker-data-update.c
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-data-update.c	(original)
+++ branches/turtle/src/libtracker-data/tracker-data-update.c	Tue Dec 16 13:36:02 2008
@@ -40,8 +40,6 @@
 	TrackerConfig *config;
 } ForeachInMetadataInfo;
 
-static TrackerConfig   *config = NULL;
-static TrackerLanguage *language = NULL;
 
 guint32
 tracker_data_update_get_new_service_id (TrackerDBInterface *iface)
@@ -601,7 +599,9 @@
 
 	if (service_id != 0) {
 		tracker_data_update_delete_service (service, service_id);
-		tracker_data_update_delete_service_recursively (service, (gchar *) path);
+		if (strcmp (service_type, "Folders") == 0) {
+			tracker_data_update_delete_service_recursively (service, (gchar *) path);
+		}
 		tracker_data_update_delete_all_metadata (service, service_id);
 	}
 }
@@ -682,33 +682,11 @@
 		set_metadata (field, value, user_data);
 	} else {
 		GList *list;
-
 		for (list = value; list; list = list->next)
 			set_metadata (field, list->data, user_data);
-
 	}
 }
 
-
-void
-tracker_data_update_turtle_import_start (void)
-{
-	if (!config)
-		config = tracker_config_new ();
-	if (!language)
-		language = tracker_language_new (config);
-}
-
-void
-tracker_data_update_turtle_import_stop (void)
-{
-	g_object_unref (language);
-	g_object_unref (config);
-	language = NULL;
-	config = NULL;
-}
-
-
 /* TODO: URI branch path -> uri */
 
 void 
@@ -765,9 +743,6 @@
 							 dirname, basename);
 
 	if (error) {
-#ifdef TURTLE_DEBUG
-		g_debug ("Q ERROR: %s\n", error->message);
-#endif /* TURTLE_DEBUG */
 		g_error_free (error);
 	}
 
@@ -787,18 +762,13 @@
 			info->service = service;
 			info->iid_value = iid_value;
 
-			info->config = config ? g_object_ref (config) : NULL;
-			info->language = language ? g_object_ref (language) : NULL;
+			info->config = tracker_data_manager_get_config ();
+			info->language = tracker_data_manager_get_language ();
 
 			g_hash_table_foreach (metadata, 
 					      foreach_in_metadata_set_metadata,
 					      info);
 
-			if (info->language)
-				g_object_unref (info->language);
-			if (info->config)
-				g_object_unref (info->config);
-
 			g_slice_free (ForeachInMetadataInfo, info);
 		}
 
@@ -822,18 +792,13 @@
 			info->service = service;
 			info->iid_value = id;
 
-			info->config = config ? g_object_ref (config) : NULL;
-			info->language = language ? g_object_ref (language) : NULL;
+			info->config = tracker_data_manager_get_config ();
+			info->language = tracker_data_manager_get_language ();
 
 			g_hash_table_foreach (metadata, 
 					      foreach_in_metadata_set_metadata,
 					      info);
 
-			if (info->language)
-				g_object_unref (info->language);
-			if (info->config)
-				g_object_unref (info->config);
-
 			g_slice_free (ForeachInMetadataInfo, info);
 		}
 

Modified: branches/turtle/src/libtracker-data/tracker-data-update.h
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-data-update.h	(original)
+++ branches/turtle/src/libtracker-data/tracker-data-update.h	Tue Dec 16 13:36:02 2008
@@ -58,8 +58,6 @@
 							 GHashTable          *metadata);
 void     tracker_data_update_delete_service_by_path     (const gchar         *path,
 							 const gchar         *rdf_type);
-void     tracker_data_update_turtle_import_start        (void);
-void     tracker_data_update_turtle_import_stop         (void);
 
 /* Metadata */
 void     tracker_data_update_set_metadata               (TrackerService      *service,

Modified: branches/turtle/src/libtracker-data/tracker-turtle.h
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-turtle.h	(original)
+++ branches/turtle/src/libtracker-data/tracker-turtle.h	Tue Dec 16 13:36:02 2008
@@ -23,9 +23,10 @@
 #ifndef __TRACKER_TURTLE_H__
 #define __TRACKER_TURTLE_H__
 
-#include <libtracker-data/tracker-data-metadata.h>
 #include <stdio.h>
 
+#include <libtracker-data/tracker-data-metadata.h>
+
 #ifdef HAVE_RAPTOR
 #include <raptor.h>
 #endif
@@ -35,7 +36,7 @@
 */
 
 #ifdef HAVE_RAPTOR
-typedef raptor_statement stmt;
+typedef raptor_statement TrackerRaptorStatement;
 #else
 typedef struct {
   gconstpointer subject;
@@ -46,12 +47,12 @@
   gint object_type;
   gpointer object_literal_datatype;
   const guchar *object_literal_language;
-} stmt;
+} TrackerRaptorStatement;
 #endif
 
 G_BEGIN_DECLS
 
-typedef void (* TurtleTripleCallback) (void *user_data, const stmt *triple);
+typedef void (* TurtleTripleCallback) (void *user_data, const TrackerRaptorStatement *triple);
 
 typedef struct TurtleFile TurtleFile;
 
@@ -76,8 +77,10 @@
 void        tracker_turtle_add_metadata    (TurtleFile          *turtle,
 					    const gchar         *uri,
 					    TrackerDataMetadata *metadata);
+
+/* @metadata_items contains TrackerTurtleMetadataItem instances */
 void        tracker_turtle_add_metadatas   (TurtleFile          *turtle,
-					    GPtrArray /* <TrackerTurtleMetadataItem> */ *metadata_items);
+					    GPtrArray           *metadata_items);
 void        tracker_turtle_close           (TurtleFile          *turtle);
 
 /* Reading functions */

Modified: branches/turtle/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/turtle/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/turtle/src/tracker-indexer/tracker-indexer.c	Tue Dec 16 13:36:02 2008
@@ -3031,7 +3031,7 @@
 }
 
 static void
-restore_backup_triple (void *user_data, const stmt *triple) {
+restore_backup_triple (void *user_data, const TrackerRaptorStatement *triple) {
 
 	const gchar    *values[2];
 	TrackerIndexer *indexer = user_data;

Modified: branches/turtle/src/tracker-indexer/tracker-removable-device.c
==============================================================================
--- branches/turtle/src/tracker-indexer/tracker-removable-device.c	(original)
+++ branches/turtle/src/tracker-indexer/tracker-removable-device.c	Tue Dec 16 13:36:02 2008
@@ -35,12 +35,14 @@
 
 #include "config.h"
 
+
 #ifdef HAVE_RAPTOR
 
 #include <stdlib.h>
 #include <string.h>
 #include <sys/statvfs.h>
 
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <gmodule.h>
@@ -51,8 +53,12 @@
 #include <libtracker-data/tracker-data-update.h>
 #include <libtracker-data/tracker-turtle.h>
 
-#include "tracker-removable-device.h"
 #include "tracker-module-metadata-private.h"
+#endif
+
+#include "tracker-removable-device.h"
+
+#ifdef HAVE_RAPTOR
 
 typedef struct {
 	const gchar *ttl_file;
@@ -144,7 +150,7 @@
 
 	subject = (gchar *) raptor_uri_as_string ((raptor_uri *) triple->subject);
 
-	if (!info->last_subject || strcmp (subject, info->last_subject) != 0) {
+	if (!info->last_subject || g_strcmp0 (subject, info->last_subject) != 0) {
 
 		/* Commit previous subject */
 		commit_turtle_parse_info_storer (info, TRUE, REPLACE, NULL);
@@ -159,7 +165,7 @@
 
 		predicate = g_strdup ((const gchar *) raptor_uri_as_string ((raptor_uri *) triple->predicate));
 
-		if (strcmp (predicate, "rdf:type") == 0) {
+		if (g_strcmp0 (predicate, "rdf:type") == 0) {
 			g_free (info->rdf_type);
 
 			/* TODO: ontology */
@@ -175,8 +181,8 @@
 	} else if (triple->object_type == RAPTOR_IDENTIFIER_TYPE_RESOURCE) {
 		gchar *key = g_strdup_printf ("file://%s/", info->base);
 
-		if (triple->object && strcmp (key, triple->object) == 0 && 
-		    triple->predicate && strcmp (key, triple->predicate) == 0) 
+		if (g_strcmp0 (key, triple->object) == 0 && 
+		    g_strcmp0 (key, triple->predicate) == 0) 
 		   {
 			/* <URI> <rdf:type> "Type" ;                    *
 			 *       <> <>  -  is a removal of the resource */
@@ -188,8 +194,8 @@
 			commit_turtle_parse_info_storer (info, FALSE, REMOVAL, NULL);
 		   } 
 		else 
-		if (triple->object && strcmp (key, triple->object) == 0 && 
-		    triple->predicate && strcmp (key, triple->predicate) != 0) 
+		if (g_strcmp0 (key, triple->object) == 0 && 
+		    g_strcmp0 (key, triple->predicate) != 0) 
 		   {
 			gchar        *predicate;
 
@@ -208,8 +214,8 @@
 
 		   }
 		else
-		if (triple->object && strcmp (key, triple->object) != 0 && 
-		    triple->predicate && strcmp (key, triple->predicate) == 0) 
+		if (g_strcmp0 (key, triple->object) != 0 && 
+		    g_strcmp0 (key, triple->predicate) == 0) 
 		   {
 			gchar        *object;
 			/* <URI> <> <to-URI>  -  is a move of the subject */
@@ -264,8 +270,6 @@
 
 		tracker_indexer_transaction_open (info->indexer);
 
-		tracker_data_update_turtle_import_start ();
-
 		base_uri = g_strdup_printf ("file://%s/", mount_point);
 		tracker_turtle_process (file, base_uri, consume_triple_storer, info);
 		g_free (base_uri);
@@ -279,8 +283,6 @@
 		/* We will (always) be left in open state, so we commit the 
 		 * last opened transaction */
 
-		tracker_data_update_turtle_import_stop ();
-
 		tracker_indexer_transaction_commit (info->indexer);
 
 		g_free (info->base);

Modified: branches/turtle/src/trackerd/tracker-main.c
==============================================================================
--- branches/turtle/src/trackerd/tracker-main.c	(original)
+++ branches/turtle/src/trackerd/tracker-main.c	Tue Dec 16 13:36:02 2008
@@ -784,7 +784,7 @@
 static void
 crawling_finished_cb (TrackerProcessor *processor, gpointer user_data)
 {
-	gulong *callback_id = (gulong *)user_data;
+	gulong *callback_id = user_data;
 	GError *error;
 	static gint counter = 0;