[tracker/slo-onto: 8/11] tracker-extract: PDF: SLO ontology porting

[Philip Van Hoof <pvanhoof src gnome org>]

commit 439385e561b37071c1caae137eaecb3da4ffd789
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Jan 10 16:06:42 2011 +0100

    tracker-extract: PDF: SLO ontology porting

 src/tracker-extract/tracker-extract-pdf.cpp |   26 +++-----------------------
 1 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-pdf.cpp b/src/tracker-extract/tracker-extract-pdf.cpp
index c1febd3..a15ff8a 100644
--- a/src/tracker-extract/tracker-extract-pdf.cpp
+++ b/src/tracker-extract/tracker-extract-pdf.cpp
@@ -742,35 +742,15 @@ extract_pdf (const gchar          *uri,
 			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 */