From: Radoslaw Jablonski <radoslawjablonski@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Rafal Michalski <michalski.raf@gmail.com>
Subject: [PATCH obexd 1/1] Fix missing URL vCard's field with OTHER subtype
Date: Fri, 4 Nov 2011 15:00:51 +0100 [thread overview]
Message-ID: <1320415251-10350-2-git-send-email-radoslawjablonski@gmail.com> (raw)
In-Reply-To: <1320415251-10350-1-git-send-email-radoslawjablonski@gmail.com>
From: Rafal Michalski <michalski.raf@gmail.com>
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.
---
plugins/phonebook-tracker.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index e4f2383..a8b97c2 100644
--- a/plugins/phonebook-tracker.c
+++ b/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 . " \
--
1.6.3.3
next prev parent reply other threads:[~2011-11-04 14:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 14:00 [PATCH obexd 0/1] Fix for missing URL in vcard data problem Radoslaw Jablonski
2011-11-04 14:00 ` Radoslaw Jablonski [this message]
2011-11-10 11:22 ` [PATCH obexd 1/1] Fix missing URL vCard's field with OTHER subtype Mika Linnanoja
2011-11-10 11:44 ` Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320415251-10350-2-git-send-email-radoslawjablonski@gmail.com \
--to=radoslawjablonski@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=michalski.raf@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).