[PATCH obexd] Show owner vcard in phonebook pb pull

[PATCH obexd] Show owner vcard in phonebook pb pull

[Radoslaw Jablonski]

Previously 'owner' vcard was visible in vcardlisting of 'pb'
but not in result of pull 'pb' phonebook.
Due to that, vcardlisting and pull operations were returning
different number of results(also return values of PhonebookSize
request were inconsistent)
---
 plugins/phonebook-tracker.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
index d1f4cd7..29dd05c 100644
--- a/plugins/phonebook-tracker.c
+++ b/plugins/phonebook-tracker.c
@@ -139,7 +139,6 @@
 "WHERE {"								\
 "	?_contact a nco:PersonContact ."				\
 "	OPTIONAL {?_contact nco:hasAffiliation ?_role .}"		\
-"	FILTER (regex(str(?_contact), \"urn:uuid:\"))"			\
 "}"									\
 "ORDER BY tracker:id(?_contact)"
 
@@ -361,7 +360,6 @@ COMBINED_CONSTRAINT		\
 	"SELECT COUNT(?c) "						\
 	"WHERE {"							\
 		"?c a nco:PersonContact ."				\
-		"FILTER (regex(str(?c), \"urn:uuid:\"))"		\
 	"}"
 
 #define MISSED_CALLS_COUNT_QUERY					\
-- 
1.7.0.4

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Luiz Augusto von Dentz]

Hi Radek,

On Wed, Jul 20, 2011 at 12:58 PM, Radoslaw Jablonski
<radoslawjablonski@gmail.com> wrote:
> Previously 'owner' vcard was visible in vcardlisting of 'pb'
> but not in result of pull 'pb' phonebook.
> Due to that, vcardlisting and pull operations were returning
> different number of results(also return values of PhonebookSize
> request were inconsistent)
> ---
>  plugins/phonebook-tracker.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
> index d1f4cd7..29dd05c 100644
> --- a/plugins/phonebook-tracker.c
> +++ b/plugins/phonebook-tracker.c
> @@ -139,7 +139,6 @@
>  "WHERE {"                                                              \
>  "      ?_contact a nco:PersonContact ."                                \
>  "      OPTIONAL {?_contact nco:hasAffiliation ?_role .}"               \
> -"      FILTER (regex(str(?_contact), \"urn:uuid:\"))"                  \
>  "}"                                                                    \
>  "ORDER BY tracker:id(?_contact)"
>
> @@ -361,7 +360,6 @@ COMBINED_CONSTRAINT         \
>        "SELECT COUNT(?c) "                                             \
>        "WHERE {"                                                       \
>                "?c a nco:PersonContact ."                              \
> -               "FILTER (regex(str(?c), \"urn:uuid:\"))"                \
>        "}"
>
>  #define MISSED_CALLS_COUNT_QUERY                                       \
> --
> 1.7.0.4

I wonder if we came to any conclusion about having the queries in
separate files, the way it is right now the queries only works for
harmattan which makes tracker backend harmattan specific as they are
hard coded in it, it is also much more convenient for testing if you
we can just change the queries without having to recompile every time.

-- 
Luiz Augusto von Dentz

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Radek]

Hi Luiz,

On Wed, Jul 20, 2011 at 12:15 PM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> Hi Radek,
>
> On Wed, Jul 20, 2011 at 12:58 PM, Radoslaw Jablonski
> <radoslawjablonski@gmail.com> wrote:
>> Previously 'owner' vcard was visible in vcardlisting of 'pb'
>> but not in result of pull 'pb' phonebook.
>> Due to that, vcardlisting and pull operations were returning
>> different number of results(also return values of PhonebookSize
>> request were inconsistent)
>> ---
>>  plugins/phonebook-tracker.c |    2 --
>>  1 files changed, 0 insertions(+), 2 deletions(-)
>>
>> diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
>> index d1f4cd7..29dd05c 100644
>> --- a/plugins/phonebook-tracker.c
>> +++ b/plugins/phonebook-tracker.c
>> @@ -139,7 +139,6 @@
>>  "WHERE {"                                                              \
>>  "      ?_contact a nco:PersonContact ."                                \
>>  "      OPTIONAL {?_contact nco:hasAffiliation ?_role .}"               \
>> -"      FILTER (regex(str(?_contact), \"urn:uuid:\"))"                  \
>>  "}"                                                                    \
>>  "ORDER BY tracker:id(?_contact)"
>>
>> @@ -361,7 +360,6 @@ COMBINED_CONSTRAINT         \
>>        "SELECT COUNT(?c) "                                             \
>>        "WHERE {"                                                       \
>>                "?c a nco:PersonContact ."                              \
>> -               "FILTER (regex(str(?c), \"urn:uuid:\"))"                \
>>        "}"
>>
>>  #define MISSED_CALLS_COUNT_QUERY                                       \
>> --
>> 1.7.0.4
>
> I wonder if we came to any conclusion about having the queries in
> separate files, the way it is right now the queries only works for
> harmattan which makes tracker backend harmattan specific as they are
> hard coded in it, it is also much more convenient for testing if you
> we can just change the queries without having to recompile every time.

Yes, that makes sense. I can do little code refactoring to add "sparql query
from file" support.
But I would prefer to do little later with separate set of patches,
after this patch will be in upstream. Hope that is acceptable:)
>
> --
> Luiz Augusto von Dentz
>

BR,
Radek

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Luiz Augusto von Dentz]

Hi Radek,

On Wed, Jul 20, 2011 at 2:08 PM, Radek <radoslawjablonski@gmail.com> wrote:
> Hi Luiz,
>
> On Wed, Jul 20, 2011 at 12:15 PM, Luiz Augusto von Dentz
> <luiz.dentz@gmail.com> wrote:
>> Hi Radek,
>>
>> On Wed, Jul 20, 2011 at 12:58 PM, Radoslaw Jablonski
>> <radoslawjablonski@gmail.com> wrote:
>>> Previously 'owner' vcard was visible in vcardlisting of 'pb'
>>> but not in result of pull 'pb' phonebook.
>>> Due to that, vcardlisting and pull operations were returning
>>> different number of results(also return values of PhonebookSize
>>> request were inconsistent)
>>> ---
>>>  plugins/phonebook-tracker.c |    2 --
>>>  1 files changed, 0 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/plugins/phonebook-tracker.c b/plugins/phonebook-tracker.c
>>> index d1f4cd7..29dd05c 100644
>>> --- a/plugins/phonebook-tracker.c
>>> +++ b/plugins/phonebook-tracker.c
>>> @@ -139,7 +139,6 @@
>>>  "WHERE {"                                                              \
>>>  "      ?_contact a nco:PersonContact ."                                \
>>>  "      OPTIONAL {?_contact nco:hasAffiliation ?_role .}"               \
>>> -"      FILTER (regex(str(?_contact), \"urn:uuid:\"))"                  \
>>>  "}"                                                                    \
>>>  "ORDER BY tracker:id(?_contact)"
>>>
>>> @@ -361,7 +360,6 @@ COMBINED_CONSTRAINT         \
>>>        "SELECT COUNT(?c) "                                             \
>>>        "WHERE {"                                                       \
>>>                "?c a nco:PersonContact ."                              \
>>> -               "FILTER (regex(str(?c), \"urn:uuid:\"))"                \
>>>        "}"
>>>
>>>  #define MISSED_CALLS_COUNT_QUERY                                       \
>>> --
>>> 1.7.0.4
>>
>> I wonder if we came to any conclusion about having the queries in
>> separate files, the way it is right now the queries only works for
>> harmattan which makes tracker backend harmattan specific as they are
>> hard coded in it, it is also much more convenient for testing if you
>> we can just change the queries without having to recompile every time.
>
> Yes, that makes sense. I can do little code refactoring to add "sparql query
> from file" support.
> But I would prefer to do little later with separate set of patches,
> after this patch will be in upstream. Hope that is acceptable:)

Sure, it just came to my mind that we had discussed doing this before,
so I decided to ask about it since this is somewhat related to the
fact that we hardcoded the queries in the code.


-- 
Luiz Augusto von Dentz

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Johan Hedberg]

Hi Radek,

On Wed, Jul 20, 2011, Radoslaw Jablonski wrote:
> Previously 'owner' vcard was visible in vcardlisting of 'pb' but not
> in result of pull 'pb' phonebook. Due to that, vcardlisting and pull
> operations were returning different number of results (also return
> values of PhonebookSize request were inconsistent)
> ---
>  plugins/phonebook-tracker.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)

The patch itself seems fine, but before applying I just wanna
double-check if your git author email change from @nokia.com to
@gmail.com is intentional (all your patches so far have been with
@nokia.com).

Johan

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Radek]

Hi Johan,

On Tue, Jul 26, 2011 at 12:36 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> Hi Radek,
>
> On Wed, Jul 20, 2011, Radoslaw Jablonski wrote:
>> Previously 'owner' vcard was visible in vcardlisting of 'pb' but not
>> in result of pull 'pb' phonebook. Due to that, vcardlisting and pull
>> operations were returning different number of results (also return
>> values of PhonebookSize request were inconsistent)
>> ---
>>  plugins/phonebook-tracker.c |    2 --
>>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> The patch itself seems fine, but before applying I just wanna
> double-check if your git author email change from @nokia.com to
> @gmail.com is intentional (all your patches so far have been with
> @nokia.com).
Yes, that change of email is intentional - all my patches now will be sent
using gmail account (network configutation issues - problem with using
@nokia account outside Finland:) )

BR,
Radek
>
> Johan
>

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Luiz Augusto von Dentz]

Hi Radek,

On Tue, Jul 26, 2011 at 2:07 PM, Radek <radoslawjablonski@gmail.com> wrote:
> Hi Johan,
>
> On Tue, Jul 26, 2011 at 12:36 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
>> Hi Radek,
>>
>> On Wed, Jul 20, 2011, Radoslaw Jablonski wrote:
>>> Previously 'owner' vcard was visible in vcardlisting of 'pb' but not
>>> in result of pull 'pb' phonebook. Due to that, vcardlisting and pull
>>> operations were returning different number of results (also return
>>> values of PhonebookSize request were inconsistent)
>>> ---
>>>  plugins/phonebook-tracker.c |    2 --
>>>  1 files changed, 0 insertions(+), 2 deletions(-)
>>
>> The patch itself seems fine, but before applying I just wanna
>> double-check if your git author email change from @nokia.com to
>> @gmail.com is intentional (all your patches so far have been with
>> @nokia.com).
> Yes, that change of email is intentional - all my patches now will be sent
> using gmail account (network configutation issues - problem with using
> @nokia account outside Finland:) )

Just a tip, the author and the email do not need to be the same, if
you want you can configure gmail as your server/from maintaining the
author field.

-- 
Luiz Augusto von Dentz

Re: [PATCH obexd] Show owner vcard in phonebook pb pull

[Johan Hedberg]

Hi Radek,

On Tue, Jul 26, 2011, Radek wrote:
> On Tue, Jul 26, 2011 at 12:36 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> > Hi Radek,
> >
> > On Wed, Jul 20, 2011, Radoslaw Jablonski wrote:
> >> Previously 'owner' vcard was visible in vcardlisting of 'pb' but not
> >> in result of pull 'pb' phonebook. Due to that, vcardlisting and pull
> >> operations were returning different number of results (also return
> >> values of PhonebookSize request were inconsistent)
> >> ---
> >>  plugins/phonebook-tracker.c |    2 --
> >>  1 files changed, 0 insertions(+), 2 deletions(-)
> >
> > The patch itself seems fine, but before applying I just wanna
> > double-check if your git author email change from @nokia.com to
> > @gmail.com is intentional (all your patches so far have been with
> > @nokia.com).
> Yes, that change of email is intentional - all my patches now will be sent
> using gmail account (network configutation issues - problem with using
> @nokia account outside Finland:) )

Ok, thanks for the confirmation. The patch has now been pushed upstream.

Johan