korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-12 13:34:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

obexd: Adjust SPARQL queries to the changes in call history

Browse Source 
Currently nmo:Call resources put to the Tracker by commhistory do not use
the same nco:PhoneNumber as the one bound to the nco:PersonContact. This
patch introduces matching contacts by actual phone number, thus returning
proper contact data regardless of this commhistory change.
This commit is contained in:
Slawomir Bochenski 2011-05-10 13:09:41 +02:00 committed by Marcel Holtmann
parent bca372b405
commit f7e9ee6cb9
1 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
obexd/plugins/phonebook-tracker.c
View File

@ -231,7 +231,7 @@
"OPTIONAL { ?_contact nco:hasAffiliation ?_role .} " \
"} UNION { " \
"?_ncontact a nco:Contact . " \
"?_ncontact nco:hasPhoneNumber ?_number . " \
"?_ncontact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:from ?_ncontact ; " \
"nmo:isAnswered false ;" \
@ -239,9 +239,11 @@
"?_contact a nco:PersonContact . " \
"?_contact nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum . " \
"?_number maemo:localPhoneNumber ?_realnum . " \
"} UNION { " \
"?_unb_contact a nco:Contact . " \
"?_unb_contact nco:hasPhoneNumber ?_number . " \
"?_unb_contact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:from ?_unb_contact ; " \
"nmo:isAnswered false ;" \
@ -250,7 +252,9 @@
"nco:hasPhoneNumber ?_number . } " \
"OPTIONAL {?_contact a nco:PersonContact ; " \
"nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number. } " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum . " \
"?_number maemo:localPhoneNumber ?_realnum . }" \
"FILTER ( !bound(?_contact) && !bound(?_role) ) " \
"} " \
"} " \
@ -288,7 +292,9 @@
"nmo:isAnswered false ." \
"?c a nco:PersonContact . " \
"?c nco:hasAffiliation ?a . " \
"?a nco:hasPhoneNumber ?h . " \
"?a nco:hasPhoneNumber ?no . " \
"?h maemo:localPhoneNumber ?num . " \
"?no maemo:localPhoneNumber ?num . " \
"} " \
"} GROUP BY ?call ORDER BY DESC(nmo:receivedDate(?call))"
@ -368,7 +374,7 @@
"OPTIONAL { ?_contact nco:hasAffiliation ?_role .} " \
"} UNION { " \
"?_ncontact a nco:Contact . " \
"?_ncontact nco:hasPhoneNumber ?_number . " \
"?_ncontact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:from ?_ncontact ; " \
"nmo:isAnswered true ;" \
@ -376,9 +382,11 @@
"?_contact a nco:PersonContact . " \
"?_contact nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_number maemo:localPhoneNumber ?_realnum . " \
"?_other maemo:localPhoneNumber ?_realnum . " \
"} UNION { " \
"?_unb_contact a nco:Contact . " \
"?_unb_contact nco:hasPhoneNumber ?_number . " \
"?_unb_contact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:from ?_unb_contact ; " \
"nmo:isAnswered true ;" \
@ -387,7 +395,9 @@
"nco:hasPhoneNumber ?_number . } " \
"OPTIONAL {?_contact a nco:PersonContact ; " \
"nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number. } " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_number maemo:localPhoneNumber ?_realnum ." \
"?_other maemo:localPhoneNumber ?_realnum . }" \
"FILTER ( !bound(?_contact) && !bound(?_role) ) " \
"} " \
"} "\
@ -424,7 +434,9 @@
"nmo:isAnswered true ." \
"?c a nco:PersonContact . " \
"?c nco:hasAffiliation ?a . " \
"?a nco:hasPhoneNumber ?h . " \
"?a nco:hasPhoneNumber ?no . " \
"?h maemo:localPhoneNumber ?num . " \
"?no maemo:localPhoneNumber ?num . " \
"}" \
"} GROUP BY ?call ORDER BY DESC(nmo:receivedDate(?call))"
@ -503,16 +515,18 @@
"OPTIONAL { ?_contact nco:hasAffiliation ?_role .} " \
"} UNION { " \
"?_ncontact a nco:Contact . " \
"?_ncontact nco:hasPhoneNumber ?_number . " \
"?_ncontact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:to ?_ncontact ; " \
"nmo:isSent true . " \
"?_contact a nco:PersonContact . " \
"?_contact nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum . " \
"?_number maemo:localPhoneNumber ?_realnum . " \
"} UNION { " \
"?_unb_contact a nco:Contact . " \
"?_unb_contact nco:hasPhoneNumber ?_number . " \
"?_unb_contact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:to ?_unb_contact ; " \
"nmo:isSent true . " \
@ -520,7 +534,9 @@
"nco:hasPhoneNumber ?_number . } " \
"OPTIONAL {?_contact a nco:PersonContact ; " \
"nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number. } " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum ." \
"?_number maemo:localPhoneNumber ?_realnum . }" \
"FILTER ( !bound(?_contact) && !bound(?_role) ) " \
"} " \
"} " \
@ -554,7 +570,9 @@
"nmo:isSent true . " \
"?c a nco:PersonContact . " \
"?c nco:hasAffiliation ?a . " \
"?a nco:hasPhoneNumber ?h . " \
"?a nco:hasPhoneNumber ?no . " \
"?h maemo:localPhoneNumber ?num . " \
"?no maemo:localPhoneNumber ?num . " \
"}" \
"} GROUP BY ?call ORDER BY DESC(nmo:sentDate(?call))"
@ -633,16 +651,18 @@
"OPTIONAL { ?_contact nco:hasAffiliation ?_role .} " \
"} UNION { " \
"?_ncontact a nco:Contact . " \
"?_ncontact nco:hasPhoneNumber ?_number . " \
"?_ncontact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:to ?_ncontact ; " \
"nmo:isSent true . " \
"?_contact a nco:PersonContact . " \
"?_contact nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum . " \
"?_number maemo:localPhoneNumber ?_realnum . " \
"} UNION { " \
"?_unb_contact a nco:Contact . " \
"?_unb_contact nco:hasPhoneNumber ?_number . " \
"?_unb_contact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:to ?_unb_contact ; " \
"nmo:isSent true . " \
@ -650,7 +670,9 @@
"nco:hasPhoneNumber ?_number . } " \
"OPTIONAL {?_contact a nco:PersonContact ; " \
"nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number. } " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum ." \
"?_number maemo:localPhoneNumber ?_realnum . }" \
"FILTER ( !bound(?_contact) && !bound(?_role) ) " \
"} UNION { " \
"?_ncontact a nco:Contact . " \
@ -663,16 +685,18 @@
"OPTIONAL { ?_contact nco:hasAffiliation ?_role .} " \
"} UNION { " \
"?_ncontact a nco:Contact . " \
"?_ncontact nco:hasPhoneNumber ?_number . " \
"?_ncontact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:from ?_ncontact ; " \
"nmo:isSent false . " \
"?_contact a nco:PersonContact . " \
"?_contact nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum . " \
"?_number maemo:localPhoneNumber ?_realnum . " \
"} UNION { " \
"?_unb_contact a nco:Contact . " \
"?_unb_contact nco:hasPhoneNumber ?_number . " \
"?_unb_contact nco:hasPhoneNumber ?_other . " \
"?_call a nmo:Call ; " \
"nmo:from ?_unb_contact ; " \
"nmo:isSent false . " \
@ -680,7 +704,9 @@
"nco:hasPhoneNumber ?_number . } " \
"OPTIONAL {?_contact a nco:PersonContact ; " \
"nco:hasAffiliation ?_role . " \
"?_role nco:hasPhoneNumber ?_number. } " \
"?_role nco:hasPhoneNumber ?_number . " \
"?_other maemo:localPhoneNumber ?_realnum ." \
"?_number maemo:localPhoneNumber ?_realnum . }" \
"FILTER ( !bound(?_contact) && !bound(?_role) ) " \
"} " \
"} " \
@ -713,7 +739,9 @@
"nmo:isSent true . " \
"?c a nco:PersonContact . " \
"?c nco:hasAffiliation ?a . " \
"?a nco:hasPhoneNumber ?h . " \
"?a nco:hasPhoneNumber ?no . " \
"?h maemo:localPhoneNumber ?num . " \
"?no maemo:localPhoneNumber ?num . " \
"}UNION {" \
"?c a nco:Contact . " \
"?c nco:hasPhoneNumber ?h . " \
@ -736,7 +764,9 @@
"nmo:isSent false . " \
"?c a nco:PersonContact . " \
"?c nco:hasAffiliation ?a . " \
"?a nco:hasPhoneNumber ?h . " \
"?a nco:hasPhoneNumber ?no . " \
"?h maemo:localPhoneNumber ?num . " \
"?no maemo:localPhoneNumber ?num . " \
"}" \
"} GROUP BY ?call ORDER BY DESC(nmo:receivedDate(?call))"
@ -887,7 +917,9 @@
"nmo:isAnswered false ." \
"?c a nco:PersonContact . " \
"?c nco:hasAffiliation ?a . " \
"?a nco:hasPhoneNumber ?h . " \
"?a nco:hasPhoneNumber ?no . " \
"?h maemo:localPhoneNumber ?num . " \
"?no maemo:localPhoneNumber ?num . " \
"} " \
"} GROUP BY ?call ORDER BY DESC(nmo:receivedDate(?call)) " \
"LIMIT 40"