summaryrefslogtreecommitdiff
path: root/plugins/phonebook-tracker.c
diff options
context:
space:
mode:
authorBartosz Szatkowski <bulislaw@linux.com>2011-08-05 13:01:30 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2011-08-05 15:06:47 +0300
commit964a9a7e91d8affa42b78ac37cc321eef0494721 (patch)
treeb6b274ef4ae622e17cd53278097070f0fa4f92cb /plugins/phonebook-tracker.c
parent6ce9a2b35b259f2406161fff2f6175e275f07509 (diff)
downloadobexd-964a9a7e91d8affa42b78ac37cc321eef0494721.tar.gz
Fix handling vCard type "OTHER" emails in PBAP
Until now contacts with emails, without type specified, were not included in vCards. Also default type for vCard 3.0 is set to "OTHER" - not empty field as it is in vCard 2.1.
Diffstat (limited to 'plugins/phonebook-tracker.c')
-rw-r--r--plugins/phonebook-tracker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index 3ac1c44..8bc070f 100644
--- a/plugins/phonebook-tracker.c
+++ b/plugins/phonebook-tracker.c
@@ -129,7 +129,7 @@
"nco:fullname(nco:org(?_role))" \
"nco:department(?_role) " \
"(SELECT GROUP_CONCAT(fn:concat(?emailaddress,\"\31\"," \
- "rdfs:label(?_role))," \
+ "tracker:coalesce(rdfs:label(?_role), \"\"))," \
"\"\30\") " \
"WHERE { " \
"?_role nco:hasEmailAddress " \
@@ -241,7 +241,7 @@ CALLS_CONSTRAINTS(CONSTRAINT) \
"nco:fullname(nco:org(?_role)) " \
"nco:department(?_role) " \
"(SELECT GROUP_CONCAT(fn:concat(?emailaddress,\"\31\"," \
- "rdfs:label(?c_role))," \
+ "tracker:coalesce(rdfs:label(?c_role), \"\"))," \
"\"\30\") " \
"WHERE { " \
"?_contact nco:hasAffiliation ?c_role . " \
@@ -334,7 +334,7 @@ COMBINED_CONSTRAINT \
"nco:fullname(nco:org(?_role))" \
"nco:department(?_role) " \
"(SELECT GROUP_CONCAT(fn:concat(?emailaddress,\"\31\"," \
- "rdfs:label(?_role))," \
+ "tracker:coalesce(rdfs:label(?_role), \"\"))," \
"\"\30\") " \
"WHERE { " \
"?_role nco:hasEmailAddress " \