[tracker/slo-onto: 7/11] tracker-extract: JPEG SLO ontology porting

[Philip Van Hoof <pvanhoof src gnome org>]

commit 7dd34ea5768f31cfe62d8bdb8a717499e2dbaa58
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Jan 10 16:06:27 2011 +0100

    tracker-extract: JPEG SLO ontology porting

 src/tracker-extract/tracker-extract-jpeg.c |   26 +++-----------------------
 1 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index 71e8007..be84db4 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -538,35 +538,15 @@ extract_jpeg (const gchar          *uri,
 	if (md.city || md.state || md.address || md.country) {
 		gchar *addruri;
 
-		tracker_sparql_builder_predicate (metadata, "mlo:location");
+		tracker_sparql_builder_predicate (metadata, "slo:location");
 
 		tracker_sparql_builder_object_blank_open (metadata); /* GeoPoint */
 		tracker_sparql_builder_predicate (metadata, "a");
-		tracker_sparql_builder_object (metadata, "mlo:GeoPoint");
-
-		if (md.address) {
-			tracker_sparql_builder_predicate (metadata, "mlo:address");
-			tracker_sparql_builder_object_unvalidated (metadata, md.address);
-		}
-
-		if (md.state) {
-			tracker_sparql_builder_predicate (metadata, "mlo:state");
-			tracker_sparql_builder_object_unvalidated (metadata, md.state);
-		}
-
-		if (md.city) {
-			tracker_sparql_builder_predicate (metadata, "mlo:city");
-			tracker_sparql_builder_object_unvalidated (metadata, md.city);
-		}
-
-		if (md.country) {
-			tracker_sparql_builder_predicate (metadata, "mlo:country");
-			tracker_sparql_builder_object_unvalidated (metadata, md.country);
-		}
+		tracker_sparql_builder_object (metadata, "slo:GeoPoint");
 
 		addruri = tracker_sparql_get_uuid_urn ();
 
-		tracker_sparql_builder_predicate (metadata, "mlo:asPostalAddress");
+		tracker_sparql_builder_predicate (metadata, "slo:postalAddress");
 		tracker_sparql_builder_object_iri (metadata, addruri);
 
 		tracker_sparql_builder_object_blank_close (metadata); /* GeoPoint */