[tracker/tracker-store] tracker-indexer: Avoid unnecessary string duplication



commit 8b3fc6fdcb0ce35a5aa55df7b7b94b18b1a5e1e1
Author: Jürg Billeter <j bitron ch>
Date:   Wed Jun 24 09:29:54 2009 +0200

    tracker-indexer: Avoid unnecessary string duplication

 .../tracker-module-metadata-utils.c                |   52 +------------------
 1 files changed, 3 insertions(+), 49 deletions(-)
---
diff --git a/src/tracker-indexer/tracker-module-metadata-utils.c b/src/tracker-indexer/tracker-module-metadata-utils.c
index cfcebde..8c1b33e 100644
--- a/src/tracker-indexer/tracker-module-metadata-utils.c
+++ b/src/tracker-indexer/tracker-module-metadata-utils.c
@@ -315,54 +315,6 @@ extractor_context_kill (ExtractorContext *context)
 }
 
 static void
-metadata_utils_add_embedded_data (TrackerModuleMetadata *metadata,
-				  const gchar           *uri,
-				  TrackerProperty       *field,
-				  const gchar           *value)
-{
-	gchar *utf_value;
-
-	if (!g_utf8_validate (value, -1, NULL)) {
-		utf_value = g_locale_to_utf8 (value, -1, NULL, NULL, NULL);
-	} else {
-		utf_value = g_strdup (value);
-	}
-
-	if (utf_value) {
-		const gchar *predicate;
-
-		predicate = tracker_property_get_uri (field);
-
-		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);
-	}
-}
-
-static void
-metadata_utils_get_embedded_foreach (TrackerModuleMetadata *metadata,
-                                     const gchar           *uri,
-                                     const gchar           *key,
-                                     const gchar           *value)
-{
-	TrackerProperty *field;
-	
-	if (!key || !value) {
-		return;
-	}
-	
-	field = tracker_ontology_get_property_by_uri (key);
-	if (!field) {
-		g_warning ("Field name '%s' isn't described in the ontology", key);
-		return;
-	}
-	
-	metadata_utils_add_embedded_data (metadata, uri, field, value);
-}
-
-static void
 get_metadata_async_cb (DBusGProxy *proxy,
 		       GPtrArray  *statements,
 		       GError     *error,
@@ -413,7 +365,9 @@ get_metadata_async_cb (DBusGProxy *proxy,
 			predicate = g_value_get_string (&statement->values[1]);
 			object = g_value_get_string (&statement->values[2]);
 
-			metadata_utils_get_embedded_foreach (context->metadata, subject, predicate, object);
+			tracker_sparql_builder_subject_iri (context->metadata->sparql, subject);
+			tracker_sparql_builder_predicate_iri (context->metadata->sparql, predicate);
+			tracker_sparql_builder_object_string (context->metadata->sparql, object);
 
 			g_value_array_free (statement);
 		}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]