[tracker/slo-onto: 9/11] tracker-extract: PNG: SLO ontology porting

[Philip Van Hoof <pvanhoof src gnome org>]

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

    tracker-extract: PNG: SLO ontology porting

 src/tracker-extract/tracker-extract-png.c |   26 +++-----------------------
 1 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 24da952..eb6bd32 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -415,35 +415,15 @@ read_metadata (TrackerSparqlBuilder *preupdate,
 	if (xd->address || xd->country || xd->city) {
 		gchar *addruri;
 
-		tracker_sparql_builder_predicate (metadata, "mlo:location");
+		tracker_sparql_builder_predicate (metadata, "slo:location");
 
 		tracker_sparql_builder_object_blank_open (metadata);
 		tracker_sparql_builder_predicate (metadata, "a");
-		tracker_sparql_builder_object (metadata, "mlo:GeoPoint"); /* GeoPoint */
-
-		if (xd->address) {
-			tracker_sparql_builder_predicate (metadata, "mlo:address");
-			tracker_sparql_builder_object_unvalidated (metadata, xd->address);
-		}
-
-		if (xd->state) {
-			tracker_sparql_builder_predicate (metadata, "mlo:state");
-			tracker_sparql_builder_object_unvalidated (metadata, xd->state);
-		}
-
-		if (xd->city) {
-			tracker_sparql_builder_predicate (metadata, "mlo:city");
-			tracker_sparql_builder_object_unvalidated (metadata, xd->city);
-		}
-
-		if (xd->country) {
-			tracker_sparql_builder_predicate (metadata, "mlo:country");
-			tracker_sparql_builder_object_unvalidated (metadata, xd->country);
-		}
+		tracker_sparql_builder_object (metadata, "slo:GeoPoint"); /* 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 */