From 6b7ddd9de2589e6739d1f0e1930d9694431af307 Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Thu, 20 May 2010 11:22:15 -0300 Subject: [PATCH] obexd: Fix the email attribute was badly formatted It was using the nco:EmailAddress uri instead of the proper email address. --- obexd/plugins/phonebook-tracker.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index 971f90309..f28b2345c 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -46,7 +46,7 @@ "SELECT nco:phoneNumber(?h) nco:fullname(?c) " \ "nco:nameFamily(?c) nco:nameGiven(?c) " \ "nco:nameAdditional(?c) nco:nameHonorificPrefix(?c) " \ - "nco:nameHonorificSuffix(?c) nco:hasEmailAddress(?c) " \ + "nco:nameHonorificSuffix(?c) nco:emailAddress(?e) " \ "nco:phoneNumber(?w) " \ "WHERE { " \ "?c a nco:PersonContact ; " \ @@ -54,6 +54,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "}" @@ -71,7 +72,7 @@ "SELECT nco:phoneNumber(?h) nco:fullname(?c) " \ "nco:nameFamily(?c) nco:nameGiven(?c) " \ "nco:nameAdditional(?c) nco:nameHonorificPrefix(?c) " \ - "nco:nameHonorificSuffix(?c) nco:hasEmailAddress(?c) " \ + "nco:nameHonorificSuffix(?c) nco:emailAddress(?e) " \ "nco:phoneNumber(?w) " \ "WHERE { " \ "?call a nmo:Call ; " \ @@ -83,6 +84,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "} ORDER BY DESC(nmo:receivedDate(?call))" @@ -104,7 +106,7 @@ "SELECT nco:phoneNumber(?h) nco:fullname(?c) " \ "nco:nameFamily(?c) nco:nameGiven(?c) " \ "nco:nameAdditional(?c) nco:nameHonorificPrefix(?c) " \ - "nco:nameHonorificSuffix(?c) nco:hasEmailAddress(?c) " \ + "nco:nameHonorificSuffix(?c) nco:emailAddress(?e) " \ "nco:phoneNumber(?w) " \ "WHERE { " \ "?call a nmo:Call ; " \ @@ -115,6 +117,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "} ORDER BY DESC(nmo:receivedDate(?call))" @@ -135,7 +138,7 @@ "SELECT nco:phoneNumber(?h) nco:fullname(?c) " \ "nco:nameFamily(?c) nco:nameGiven(?c) " \ "nco:nameAdditional(?c) nco:nameHonorificPrefix(?c) " \ - "nco:nameHonorificSuffix(?c) nco:hasEmailAddress(?c) " \ + "nco:nameHonorificSuffix(?c) nco:emailAddress(?e) " \ "nco:phoneNumber(?w) " \ "WHERE { " \ "?call a nmo:Call ; " \ @@ -146,6 +149,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "} ORDER BY DESC(nmo:sentDate(?call))" @@ -166,7 +170,7 @@ "SELECT nco:phoneNumber(?h) nco:fullname(?c) " \ "nco:nameFamily(?c) nco:nameGiven(?c) " \ "nco:nameAdditional(?c) nco:nameHonorificPrefix(?c) " \ - "nco:nameHonorificSuffix(?c) nco:hasEmailAddress(?c) " \ + "nco:nameHonorificSuffix(?c) nco:emailAddress(?e) " \ "nco:phoneNumber(?w) " \ "WHERE { " \ "{ " \ @@ -178,6 +182,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "} UNION { " \ "?call a nmo:Call ; " \ @@ -188,6 +193,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "} } " @@ -216,7 +222,7 @@ "SELECT nco:phoneNumber(?h) nco:fullname(?c) " \ "nco:nameFamily(?c) nco:nameGiven(?c) nco:nameAdditional(?c) " \ "nco:nameHonorificPrefix(?c) nco:nameHonorificSuffix(?c) " \ - "nco:hasEmailAddress(?c) " \ + "nco:emailAddress(?e) " \ "nco:phoneNumber(?w) " \ "WHERE { " \ "?c a nco:PersonContact ; " \ @@ -225,6 +231,7 @@ "OPTIONAL { " \ "?c nco:hasAffiliation ?a . " \ "?a nco:hasPhoneNumber ?w . " \ + "?c nco:hasEmailAddress ?e" \ "} " \ "}" -- 2.47.3