[tracker] libtracker-extract, tests: Ported XMP to use newer SLO ontology

[Philip Van Hoof <pvanhoof src gnome org>]

commit 0d1f62288dd9dc90fbaaec292d8835ab46f49702
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Feb 16 10:24:53 2011 +0100

    libtracker-extract, tests: Ported XMP to use newer SLO ontology

 src/libtracker-extract/tracker-xmp.c        |   29 ++++----------------------
 tests/libtracker-extract/tracker-test-xmp.c |    8 ++++++-
 2 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index ab01aab..7be0a2d 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -874,38 +874,18 @@ tracker_xmp_apply (TrackerSparqlBuilder *preupdate,
 	if (data->address || data->country || data->city) {
 		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 (data->address) {
-			tracker_sparql_builder_predicate (metadata, "mlo:address");
-			tracker_sparql_builder_object_unvalidated (metadata, data->address);
-		}
-
-		if (data->state) {
-			tracker_sparql_builder_predicate (metadata, "mlo:state");
-			tracker_sparql_builder_object_unvalidated (metadata, data->state);
-		}
-
-		if (data->city) {
-			tracker_sparql_builder_predicate (metadata, "mlo:city");
-			tracker_sparql_builder_object_unvalidated (metadata, data->city);
-		}
-
-		if (data->country) {
-			tracker_sparql_builder_predicate (metadata, "mlo:country");
-			tracker_sparql_builder_object_unvalidated (metadata, data->country);
-		}
+		tracker_sparql_builder_object (metadata, "slo:GeoLocation");
 
 		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 */
+		tracker_sparql_builder_object_blank_close (metadata); /* GeoLocation */
 
 		tracker_sparql_builder_insert_open (preupdate, NULL);
 		tracker_sparql_builder_subject_iri (preupdate, addruri);
@@ -936,6 +916,7 @@ tracker_xmp_apply (TrackerSparqlBuilder *preupdate,
 		}
 
 		tracker_sparql_builder_insert_close (preupdate);
+
 	}
 
 	return TRUE;
diff --git a/tests/libtracker-extract/tracker-test-xmp.c b/tests/libtracker-extract/tracker-test-xmp.c
index 99f2971..e46d1fd 100644
--- a/tests/libtracker-extract/tracker-test-xmp.c
+++ b/tests/libtracker-extract/tracker-test-xmp.c
@@ -322,7 +322,13 @@ test_xmp_apply_location (void)
 	tracker_sparql_builder_insert_close (metadata);
 
 	/* This is the only way to check the sparql is kinda correct */
-	g_assert_cmpint (tracker_sparql_builder_get_length (metadata), >=, 6);
+
+	/* The builder just contains this:
+	   <urn:uuid:test> slo:location [ a slo:GeoLocation ;
+		 slo:postalAddress <urn:uuid:c50c4305-c617-4188-b3d3-42ba2291d0de>] .
+	} */
+
+	g_assert_cmpint (tracker_sparql_builder_get_length (metadata), >=, 3);
 }
 
 int