From afe2e6a0fc5760024f4047e2e9f123dd48287e6d Mon Sep 17 00:00:00 2001 From: Radoslaw Jablonski Date: Tue, 11 Jan 2011 15:35:51 +0200 Subject: [PATCH] obexd: Fix history queries for contacts outside pb Phone number for contacts outside phonebook need to be fetched differently - application which saves call data saves this number directly in "nco:Contact" now. Without this fix, calls to/from numbers outside phonebook won't be listed in call history results --- obexd/plugins/phonebook-tracker.c | 32 +++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c index 25eca6216..237fb3361 100644 --- a/obexd/plugins/phonebook-tracker.c +++ b/obexd/plugins/phonebook-tracker.c @@ -152,8 +152,12 @@ "(SELECT fn:concat(rdf:type(?role_number)," \ "\"\31\", nco:phoneNumber(?role_number))" \ "WHERE {" \ - "?_role nco:hasPhoneNumber ?role_number " \ - "FILTER (?role_number = ?_number)" \ + "{" \ + " ?_role nco:hasPhoneNumber ?role_number " \ + " FILTER (?role_number = ?_number)" \ + "} UNION { " \ + "?_unb_contact nco:hasPhoneNumber ?role_number . " \ + "}" \ "} GROUP BY nco:phoneNumber(?role_number) ) " \ "nco:fullname(?_contact) " \ "nco:nameFamily(?_contact) " \ @@ -278,8 +282,12 @@ "(SELECT fn:concat(rdf:type(?role_number)," \ "\"\31\", nco:phoneNumber(?role_number))" \ "WHERE {" \ - "?_role nco:hasPhoneNumber ?role_number " \ - "FILTER (?role_number = ?_number)" \ + "{" \ + " ?_role nco:hasPhoneNumber ?role_number " \ + " FILTER (?role_number = ?_number)" \ + "} UNION { " \ + "?_unb_contact nco:hasPhoneNumber ?role_number . " \ + "}" \ "} GROUP BY nco:phoneNumber(?role_number) ) " \ "nco:fullname(?_contact) " \ "nco:nameFamily(?_contact) " \ @@ -403,8 +411,12 @@ "(SELECT fn:concat(rdf:type(?role_number)," \ "\"\31\", nco:phoneNumber(?role_number))" \ "WHERE {" \ - "?_role nco:hasPhoneNumber ?role_number " \ - "FILTER (?role_number = ?_number)" \ + "{" \ + " ?_role nco:hasPhoneNumber ?role_number " \ + " FILTER (?role_number = ?_number)" \ + "} UNION { " \ + "?_unb_contact nco:hasPhoneNumber ?role_number . " \ + "}" \ "} GROUP BY nco:phoneNumber(?role_number) ) " \ "nco:fullname(?_contact) " \ "nco:nameFamily(?_contact) " \ @@ -522,8 +534,12 @@ "(SELECT fn:concat(rdf:type(?role_number)," \ "\"\31\", nco:phoneNumber(?role_number))" \ "WHERE {" \ - "?_role nco:hasPhoneNumber ?role_number " \ - "FILTER (?role_number = ?_number)" \ + "{" \ + " ?_role nco:hasPhoneNumber ?role_number " \ + " FILTER (?role_number = ?_number)" \ + "} UNION { " \ + "?_unb_contact nco:hasPhoneNumber ?role_number . " \ + "}" \ "} GROUP BY nco:phoneNumber(?role_number) ) " \ "nco:fullname(?_contact) " \ "nco:nameFamily(?_contact) " \ -- 2.47.3