From: Rafal Michalski <michalski.raf@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Rafal Michalski <michalski.raf@gmail.com>
Subject: [PATCH obexd 2/2] Fix semicolon delimiter issue in address fields
Date: Mon, 22 Aug 2011 12:32:57 +0200 [thread overview]
Message-ID: <1314009177-19178-2-git-send-email-michalski.raf@gmail.com> (raw)
In-Reply-To: <1314009177-19178-1-git-send-email-michalski.raf@gmail.com>
Previously semicolon was used as delimiter when address vCard fields
are concatenated (at the moment of fetching from database via query).
It was introducing confusion at the moment of splitting address string
into seperate fields, since these fields may contain semicolons as well.
In this case it leads to treating some semicolons - characters in address
fields - as real delimiters (no escaped but it should) and other
semicolons - real delimiters - as characters in address field
(escaped but it shouldn't).
This patch fixes problem described above, since semicolon delimiter
is replaced by character called Unit Separator (equal to '\37') which
shouldn't be present in address fields.
---
plugins/phonebook-tracker.c | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index 56291d0..cecaf2d 100644
--- a/plugins/phonebook-tracker.c
+++ b/plugins/phonebook-tracker.c
@@ -83,6 +83,7 @@
#define MAIN_DELIM "\30" /* Main delimiter between phones, addresses, emails*/
#define SUB_DELIM "\31" /* Delimiter used in telephone number strings*/
+#define ADDR_DELIM "\37" /* Delimiter used for address data fields */
#define MAX_FIELDS 100 /* Max amount of fields to be concatenated at once*/
#define VCARDS_PART_COUNT 50 /* amount of vcards sent at once to PBAP core */
#define QUERY_OFFSET_FORMAT "%s OFFSET %d"
@@ -101,12 +102,12 @@
"nco:nameHonorificPrefix(?_contact) " \
"nco:nameHonorificSuffix(?_contact) " \
"(SELECT GROUP_CONCAT(fn:concat(" \
-"tracker:coalesce(nco:pobox(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:extendedAddress(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:streetAddress(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:locality(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:region(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:postalcode(?aff_addr), \"\"), \";\"," \
+"tracker:coalesce(nco:pobox(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:extendedAddress(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:streetAddress(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:locality(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:region(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:postalcode(?aff_addr), \"\"), \"\37\"," \
"tracker:coalesce(nco:country(?aff_addr), \"\"), " \
"\"\31\", rdfs:label(?_role) ), " \
"\"\30\") " \
@@ -210,12 +211,12 @@ CALLS_CONSTRAINTS(CONSTRAINT) \
"nco:nameHonorificPrefix(?_contact) " \
"nco:nameHonorificSuffix(?_contact) " \
"(SELECT GROUP_CONCAT(fn:concat(" \
- "tracker:coalesce(nco:pobox(?aff_addr), \"\"), \";\"," \
- "tracker:coalesce(nco:extendedAddress(?aff_addr), \"\"), \";\","\
- "tracker:coalesce(nco:streetAddress(?aff_addr), \"\"), \";\"," \
- "tracker:coalesce(nco:locality(?aff_addr), \"\"), \";\"," \
- "tracker:coalesce(nco:region(?aff_addr), \"\"), \";\"," \
- "tracker:coalesce(nco:postalcode(?aff_addr), \"\"), \";\"," \
+ "tracker:coalesce(nco:pobox(?aff_addr), \"\"), \"\37\"," \
+ "tracker:coalesce(nco:extendedAddress(?aff_addr), \"\"), \"\37\","\
+ "tracker:coalesce(nco:streetAddress(?aff_addr), \"\"), \"\37\","\
+ "tracker:coalesce(nco:locality(?aff_addr), \"\"), \"\37\"," \
+ "tracker:coalesce(nco:region(?aff_addr), \"\"), \"\37\"," \
+ "tracker:coalesce(nco:postalcode(?aff_addr), \"\"), \"\37\"," \
"tracker:coalesce(nco:country(?aff_addr), \"\"), " \
"\"\31\", rdfs:label(?c_role) ), " \
"\"\30\") " \
@@ -306,12 +307,12 @@ COMBINED_CONSTRAINT \
"nco:nameHonorificPrefix(<%s>) " \
"nco:nameHonorificSuffix(<%s>) " \
"(SELECT GROUP_CONCAT(fn:concat(" \
-"tracker:coalesce(nco:pobox(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:extendedAddress(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:streetAddress(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:locality(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:region(?aff_addr), \"\"), \";\"," \
-"tracker:coalesce(nco:postalcode(?aff_addr), \"\"), \";\"," \
+"tracker:coalesce(nco:pobox(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:extendedAddress(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:streetAddress(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:locality(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:region(?aff_addr), \"\"), \"\37\"," \
+"tracker:coalesce(nco:postalcode(?aff_addr), \"\"), \"\37\"," \
"tracker:coalesce(nco:country(?aff_addr), \"\"), " \
"\"\31\", rdfs:label(?_role) ), " \
"\"\30\") " \
@@ -886,7 +887,7 @@ static struct phonebook_addr *gen_addr(const char *address, int type)
if (address == NULL || strlen(address) < ADDR_FIELD_AMOUNT)
return NULL;
- addr_parts = g_strsplit(address, ";", ADDR_FIELD_AMOUNT);
+ addr_parts = g_strsplit(address, ADDR_DELIM, ADDR_FIELD_AMOUNT);
for (i = 0; i < ADDR_FIELD_AMOUNT; ++i)
fields = g_slist_append(fields, g_strdup(addr_parts[i]));
--
1.6.3.3
next prev parent reply other threads:[~2011-08-22 10:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 10:32 [PATCH obexd 1/2] Refactoring address fields handled in vcard module Rafal Michalski
2011-08-22 10:32 ` Rafal Michalski [this message]
2011-08-26 7:24 ` Rafał Michalski
2011-09-27 9:47 ` 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=1314009177-19178-2-git-send-email-michalski.raf@gmail.com \
--to=michalski.raf@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/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).