From c3c493f40dfc72137aa3fc9d6e19462fba70ceab Mon Sep 17 00:00:00 2001 From: Radoslaw Jablonski Date: Wed, 16 Feb 2011 11:34:15 +0200 Subject: [PATCH] obexd: Add increasing query OFFSET in phonebook_pull_read It is needed to properly move starting index in tracker for next invocations of phonebook_pull_read - without that pull result for bigger queries (over one part of data) will be wrong (it will include duplicate vcard entries). --- obexd/plugins/phonebook-tracker.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index eb38a4603..28d5c7d9c 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -1964,6 +1964,7 @@ int phonebook_pull_read(void *request) struct phonebook_data *data = request; reply_list_foreach_t pull_cb; const char *query; + char *offset_query; int col_amount; int ret; @@ -1987,6 +1988,19 @@ int phonebook_pull_read(void *request) if (query == NULL) return -ENOENT; + if (pull_cb == pull_contacts && data->tracker_index > 0) { + /* Adding offset to pull query to download next parts of data + * from tracker (phonebook_pull_read may be called many times + * from PBAP core to fetch data partially) */ + offset_query = g_strdup_printf(QUERY_OFFSET_FORMAT, query, + data->tracker_index); + ret = query_tracker(offset_query, col_amount, pull_cb, data); + + g_free(offset_query); + + return ret; + } + ret = query_tracker(query, col_amount, pull_cb, data); return ret; -- 2.47.3