From 13f5796aa5171dda4ae82497049e2bae069c12b4 Mon Sep 17 00:00:00 2001 From: Rafal Michalski Date: Wed, 26 Jan 2011 13:33:06 +0100 Subject: [PATCH] obexd: Remove unnecessary ordering from single vCard query Previously ordering for query called CONTACTS_QUERY_FROM_URI was applied. It is not needed since always only one vCard (with id specified) is fetched. --- obexd/plugins/phonebook-tracker.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index e60cf74bc..4e37f1c4e 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -788,11 +788,9 @@ "\"NOTACALL\" \"false\" \"false\" " \ "<%s> " \ "WHERE {" \ -" <%s> a nco:PersonContact ;" \ -" nco:nameFamily ?_key ." \ +" <%s> a nco:PersonContact ." \ " OPTIONAL {<%s> nco:hasAffiliation ?_role .}" \ -"}" \ -"ORDER BY ?_key tracker:id(<%s>)" +"}" #define CONTACTS_OTHER_QUERY_FROM_URI \ "SELECT fn:concat(\"TYPE_OTHER\", \"\31\", nco:phoneNumber(?t))"\ @@ -1926,8 +1924,7 @@ void *phonebook_get_entry(const char *folder, const char *id, if (strncmp(id, CONTACT_ID_PREFIX, strlen(CONTACT_ID_PREFIX)) == 0) query = g_strdup_printf(CONTACTS_QUERY_FROM_URI, id, id, id, id, - id, id, id, id, id, id, id, id, - id, id); + id, id, id, id, id, id, id, id, id); else query = g_strdup_printf(CONTACTS_OTHER_QUERY_FROM_URI, id, id, id); -- 2.47.3