From 7ffd0a2eb859fbadec3c3bfb3ad3f8596c1d25c6 Mon Sep 17 00:00:00 2001 From: Rafal Michalski Date: Fri, 4 Nov 2011 15:00:51 +0100 Subject: [PATCH] obexd: Fix missing URL vCard's field with OTHER subtype Previously URL vCard's field (imported with default OTHER subtype) was missing after pulling entire phonebook or single vCard (for phonebook and each call history as well). This patch fixes that issue by adjusting queries to URL field. --- obexd/plugins/phonebook-tracker.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index e4f23834d..a8b97c2af 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -115,7 +115,7 @@ "nco:birthDate(?_contact) " \ "nco:nickname(?_contact) " \ "(SELECT GROUP_CONCAT(fn:concat( " \ - "?url_val, \"\31\", rdfs:label(?_role) " \ + "?url_val, \"\31\", tracker:coalesce(rdfs:label(?_role), \"\") "\ "), \"\30\") " \ "WHERE {" \ "?_role nco:url ?url_val . " \ @@ -224,13 +224,11 @@ CALLS_CONSTRAINTS(CONSTRAINT) \ "}) " \ "nco:birthDate(?_contact) " \ "nco:nickname(?_contact) " \ -"(SELECT GROUP_CONCAT(fn:concat( " \ - "?url_value, \"\31\", ?aff_type " \ - "), \"\30\") " \ +"(SELECT GROUP_CONCAT(fn:concat(?url_value, \"\31\", " \ + "tracker:coalesce(rdfs:label(?c_role), \"\")), \"\30\") " \ "WHERE {" \ "?_contact nco:hasAffiliation ?c_role . " \ "?c_role nco:url ?url_value . " \ - "?c_role rdfs:label ?aff_type . " \ "})" \ "nie:url(nco:photo(?_contact)) " \ "nco:role(?_role) " \ @@ -320,7 +318,7 @@ COMBINED_CONSTRAINT \ "nco:birthDate(<%s>) " \ "nco:nickname(<%s>) " \ "(SELECT GROUP_CONCAT(fn:concat( " \ - "?url_val, \"\31\", rdfs:label(?_role) " \ + "?url_val, \"\31\", tracker:coalesce(rdfs:label(?_role), \"\") "\ "), \"\30\") " \ "WHERE {" \ "?_role nco:url ?url_val . " \ -- 2.47.3