[tracker/tracker-store] tracker-indexer: Port remaining use of TrackerModuleMetadata

[Jürg Billeter <juergbi src gnome org>]

commit ca7ff9e60202d9ff9ef32a56e850111547ee9398
Author: Jürg Billeter <j bitron ch>
Date:   Wed Jun 24 09:17:26 2009 +0200

    tracker-indexer: Port remaining use of TrackerModuleMetadata

 src/tracker-indexer/modules/gaim-conversations.c   |    5 +-
 src/tracker-indexer/tracker-indexer.c              |   23 ++++--
 .../tracker-module-metadata-utils.c                |   29 +++++--
 src/tracker-indexer/tracker-module-metadata.c      |   81 --------------------
 src/tracker-indexer/tracker-module-metadata.h      |    9 --
 5 files changed, 38 insertions(+), 109 deletions(-)
---
diff --git a/src/tracker-indexer/modules/gaim-conversations.c b/src/tracker-indexer/modules/gaim-conversations.c
index be56060..613ef89 100644
--- a/src/tracker-indexer/modules/gaim-conversations.c
+++ b/src/tracker-indexer/modules/gaim-conversations.c
@@ -117,6 +117,8 @@ gaim_file_get_metadata (TrackerModuleFile *file)
 	path_decomposed = g_strsplit (path, G_DIR_SEPARATOR_S, -1);
 	len = g_strv_length (path_decomposed);
 
+	/* Port to SparqlBuilder
+
 	metadata = tracker_module_metadata_new ();
 
 	tracker_module_metadata_add_string (metadata, uri, METADATA_CONVERSATION_USER_ACCOUNT, path_decomposed [len - 3]);
@@ -130,8 +132,9 @@ gaim_file_get_metadata (TrackerModuleFile *file)
 	g_strfreev (path_decomposed);
 	g_free (path);
 	g_free (uri);
+	 */
 
-	return metadata;
+	return NULL;
 }
 
 void
diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index d66a0bf..14a03f9 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -1089,19 +1089,21 @@ item_add_to_datasource (TrackerIndexer *indexer,
 		removable_device_urn = g_strdup_printf (TRACKER_DATASOURCE_URN_PREFIX "%s", 
 						        removable_device_udi);
 
-		tracker_module_metadata_add_string (metadata, removable_device_urn,
-						    RDF_TYPE, TRACKER_DATASOURCE);
+		tracker_sparql_builder_subject_iri (metadata->sparql, removable_device_urn);
+		tracker_sparql_builder_predicate (metadata->sparql, "a");
+		tracker_sparql_builder_object (metadata->sparql, "tracker:Volume");
 
-		tracker_module_metadata_add_string (metadata, uri, NIE_DATASOURCE_P,
-		                                    removable_device_urn);
+		tracker_sparql_builder_predicate (metadata->sparql, "nie:dataSource");
+		tracker_sparql_builder_object_iri (metadata->sparql, removable_device_urn);
 
 		g_free (removable_device_urn);
 	} else {
-		tracker_module_metadata_add_string (metadata, TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN,
-						    RDF_TYPE, TRACKER_DATASOURCE);
+		tracker_sparql_builder_subject_iri (metadata->sparql, TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN);
+		tracker_sparql_builder_predicate (metadata->sparql, "a");
+		tracker_sparql_builder_object (metadata->sparql, "tracker:Volume");
 
-		tracker_module_metadata_add_string (metadata, uri, NIE_DATASOURCE_P,
-						    TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN);
+		tracker_sparql_builder_predicate (metadata->sparql, "nie:dataSource");
+		tracker_sparql_builder_object_iri (metadata->sparql, TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN);
 	}
 }
 
@@ -1405,7 +1407,10 @@ item_process (TrackerIndexer *indexer,
 		}
 
 		if (text) {
-			tracker_module_metadata_add_string (metadata, uri, NIE_PLAIN_TEXT_CONTENT, text);
+			tracker_sparql_builder_subject_iri (metadata->sparql, uri);
+			tracker_sparql_builder_predicate (metadata->sparql, "nie:plainTextContent");
+			tracker_sparql_builder_object_string (metadata->sparql, text);
+
 			g_free (text);
 		}
 
diff --git a/src/tracker-indexer/tracker-module-metadata-utils.c b/src/tracker-indexer/tracker-module-metadata-utils.c
index 5173321..cfcebde 100644
--- a/src/tracker-indexer/tracker-module-metadata-utils.c
+++ b/src/tracker-indexer/tracker-module-metadata-utils.c
@@ -333,7 +333,9 @@ metadata_utils_add_embedded_data (TrackerModuleMetadata *metadata,
 
 		predicate = tracker_property_get_uri (field);
 
-		tracker_module_metadata_add_string (metadata, uri, predicate, utf_value);
+		tracker_sparql_builder_subject_iri (metadata->sparql, uri);
+		tracker_sparql_builder_predicate_iri (metadata->sparql, predicate);
+		tracker_sparql_builder_object_string (metadata->sparql, utf_value);
 
 		g_free (utf_value);
 	}
@@ -839,29 +841,38 @@ tracker_module_metadata_utils_get_data (GFile *file, TrackerModuleMetadata *meta
 
 	mime_type = tracker_file_get_mime_type (file);
 
-	tracker_module_metadata_add_string (metadata, uri, RDF_TYPE, NFO_FILE_DATA_OBJECT);
+	tracker_sparql_builder_subject_iri (metadata->sparql, uri);
+	tracker_sparql_builder_predicate (metadata->sparql, "a");
+	tracker_sparql_builder_object (metadata->sparql, "nfo:FileDataObject");
+
 	if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY) {
-		tracker_module_metadata_add_string (metadata, uri, RDF_TYPE, NFO_FOLDER);
+		tracker_sparql_builder_object (metadata->sparql, "nfo:Folder");
 	}
 
 	parent = g_file_get_parent (file);
 	if (parent) {
 		parent_uri = g_file_get_uri (parent);
-		tracker_module_metadata_add_string (metadata, uri, NFO_BELONGS_TO_CONTAINER, parent_uri);
+		tracker_sparql_builder_predicate (metadata->sparql, "nfo:belongsToContainer");
+		tracker_sparql_builder_object_iri (metadata->sparql, parent_uri);
 		g_free (parent_uri);
 		g_object_unref (parent);
 	}
 
-	tracker_module_metadata_add_string (metadata, uri, NFO_FILE_NAME, g_file_info_get_display_name (file_info));
-	tracker_module_metadata_add_string (metadata, uri, NIE_MIME_TYPE, mime_type);
+	tracker_sparql_builder_predicate (metadata->sparql, "nfo:fileName");
+	tracker_sparql_builder_object_string (metadata->sparql, g_file_info_get_display_name (file_info));
+
+	tracker_sparql_builder_predicate (metadata->sparql, "nie:mimeType");
+	tracker_sparql_builder_object_string (metadata->sparql, mime_type);
 
-	tracker_sparql_builder_predicate_iri (metadata->sparql, NFO_FILE_SIZE);
+	tracker_sparql_builder_predicate (metadata->sparql, "nfo:fileSize");
 	tracker_sparql_builder_object_int64 (metadata->sparql, g_file_info_get_size (file_info));
 
 	time_ = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-	tracker_module_metadata_add_date (metadata, uri, NFO_FILE_LAST_MODIFIED, time_);
+	tracker_sparql_builder_predicate (metadata->sparql, "nfo:fileLastModified");
+	tracker_sparql_builder_object_date (metadata->sparql, &time_);
 	time_ = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_TIME_ACCESS);
-	tracker_module_metadata_add_date (metadata, uri, NFO_FILE_LAST_ACCESSED, time_);
+	tracker_sparql_builder_predicate (metadata->sparql, "nfo:fileLastAccessed");
+	tracker_sparql_builder_object_date (metadata->sparql, &time_);
 
 	metadata_utils_get_embedded (file, mime_type, metadata);
 
diff --git a/src/tracker-indexer/tracker-module-metadata.c b/src/tracker-indexer/tracker-module-metadata.c
index 97eec3c..68076d1 100644
--- a/src/tracker-indexer/tracker-module-metadata.c
+++ b/src/tracker-indexer/tracker-module-metadata.c
@@ -63,87 +63,6 @@ tracker_module_metadata_finalize (GObject *object)
 	G_OBJECT_CLASS (tracker_module_metadata_parent_class)->finalize (object);
 }
 
-static gboolean
-tracker_module_metadata_add_take_string (TrackerModuleMetadata *metadata,
-					 const gchar           *subject,
-					 const gchar           *predicate,
-					 gchar                 *value)
-{
-	g_return_val_if_fail (metadata != NULL, FALSE);
-	g_return_val_if_fail (subject != NULL, FALSE);
-	g_return_val_if_fail (predicate != NULL, FALSE);
-
-	if (!value) {
-		return FALSE;
-	}
-
-	tracker_sparql_builder_subject_iri (metadata->sparql, subject);
-	tracker_sparql_builder_predicate_iri (metadata->sparql, predicate);
-	tracker_sparql_builder_object_string (metadata->sparql, value);
-
-	g_free (value);
-
-	return TRUE;
-}
-
-/**
- * tracker_module_metadata_add_string:
- * @metadata: A #TrackerModuleMetadata
- * @subject: The subject this metadata applies to (for example, a URI).
- * @predicate: The key to which the value will be assigned.
- * @value: Value for the metadata
- *
- * Adds a new metadata element as a string into @metadata.
- * see tracker_module_metadata_add_take_string().
- **/
-void
-tracker_module_metadata_add_string (TrackerModuleMetadata *metadata,
-				    const gchar           *subject,
-				    const gchar           *predicate,
-				    const gchar           *value)
-{
-	gchar *str;
-
-	str = g_strdup (value);
-
-	if (!tracker_module_metadata_add_take_string (metadata, subject, predicate, str)) {
-		g_free (str);
-	}
-}
-
-/**
- * tracker_module_metadata_add_date:
- * @metadata: A #TrackerModuleMetadata
- * @subject: The subject this metadata applies to (for example, a URI).
- * @predicate: The key to which the value will be assigned.
- * @value: Value for the metadata
- *
- * Adds a new metadata element as a time_t into @metadata.
- * see tracker_module_metadata_add_take_string().
- **/
-void
-tracker_module_metadata_add_date (TrackerModuleMetadata *metadata,
-				  const gchar           *subject,
-				  const gchar           *predicate,
-				  time_t                 value)
-{
-	struct tm t;
-	gchar *str;
-
-	gmtime_r (&value, &t);
-	str = g_strdup_printf ("%04d-%02d-%02dT%02d:%02d:%02d",
-	                       t.tm_year + 1900,
-	                       t.tm_mon + 1,
-	                       t.tm_mday,
-	                       t.tm_hour,
-	                       t.tm_min,
-	                       t.tm_sec);
-
-	if (!tracker_module_metadata_add_take_string (metadata, subject, predicate, str)) {
-		g_free (str);
-	}
-}
-
 gchar *
 tracker_module_metadata_get_sparql (TrackerModuleMetadata        *metadata)
 {
diff --git a/src/tracker-indexer/tracker-module-metadata.h b/src/tracker-indexer/tracker-module-metadata.h
index 824168e..23c1c51 100644
--- a/src/tracker-indexer/tracker-module-metadata.h
+++ b/src/tracker-indexer/tracker-module-metadata.h
@@ -54,15 +54,6 @@ GType                  tracker_module_metadata_get_type         (void) G_GNUC_CO
 
 TrackerModuleMetadata *tracker_module_metadata_new              (void);
 
-void                   tracker_module_metadata_add_string       (TrackerModuleMetadata *metadata,
-								 const gchar           *subject,
-								 const gchar           *predicate,
-								 const gchar           *value);
-void                   tracker_module_metadata_add_date         (TrackerModuleMetadata *metadata,
-								 const gchar           *subject,
-								 const gchar           *predicate,
-								 time_t                 value);
-
 G_END_DECLS
 
 #endif /* __TRACKER_MODULE_METADATA_H__*/