[tracker/poppler-glib: 12/16] tracker-extract, pdf: Port 'SLO ontology porting'

[Martyn James Russell <mr src gnome org>]

commit 3727e5b896860469c2185fcc5cbd068810d92d2e
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Feb 22 11:41:56 2011 +0100

    tracker-extract,pdf: Port 'SLO ontology porting'
    
    Original commit ID: 2b0e002a41982f4373b06e882a08ca2123f515af

 src/tracker-extract/tracker-extract-pdf.c |   27 ++++-----------------------
 1 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 283beea..41072fc 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -503,36 +503,17 @@ 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 */
 
 			tracker_sparql_builder_insert_open (preupdate, NULL);