[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Ghislain Fourny
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-1039488 into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Related bugs: Bug #1039488 in Zorba: Zorba crashes upon insert of more than one pair into an object.

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Ghislain Fourny
The bug is actually solved in jsoniq_functions_impl.cpp (a factor 2 was missing). Another bug (ordering of inserted pairs) is corrected in translator.cpp to make the test pass. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 Your team Zorba Coders is subscribed to

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba

2012-08-21 Thread Ghislain Fourny
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) Matthias Brantner (matthias-brantner) For more details, see:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/create-user-typed-atomic-item/+merge/120560 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/create-user-typed-atomic-item-2012-08-21T13-23-59.457Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/create-user-typed-atomic-item/+merge/120560 Your team Zorba Coders is subscribed to

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Ghislain Fourny
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba. Requested reviews: Chris Hillery (ceejatec) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Allowing

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue job create-user-typed-atomic-item-2012-08-21T13-23-59.457Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/create-user-typed-atomic-item/+merge/120560 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba

2012-08-21 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/create-user-typed-atomic-item/+merge/120560 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/bug-1039488 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fn-serialize-json-2012-08-21T13-52-54.553Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. --

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/structural-any-uri-lazy into lp:zorba

2012-08-21 Thread Ghislain Fourny
Hi Markos, Thanks for your feedback, this is fixed for consistency (though in general, I prefer to have all references const in function parameters). However, I could not find why the static_cast is not needed - the methods and variables are not part of the zorba::store::Item API? --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue job fn-serialize-json-2012-08-21T13-52-54.553Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 --

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Zorba Build Bot
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zdst0006-message-2012-08-21T14-21-13.73Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 Your team Zorba Coders is subscribed to branch lp:zorba. --

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/zdst0006-message into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job zdst0006-message-2012-08-21T14-21-13.73Z is finished.

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1039488-2012-08-21T14-47-56.945Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/zdst0006-message into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue job bug-1039488-2012-08-21T14-47-56.945Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug-1039488 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fn-serialize-json-2012-08-21T15-24-00.276Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Ghislain Fourny
The proposal to merge lp:~zorba-coders/zorba/zdst0006-message into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue job fn-serialize-json-2012-08-21T15-24-00.276Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/user-typed-atomic-item-is-encoded-2012-08-21T15-51-00.261Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 Your team Zorba Coders is

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 --

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1039488 into lp:zorba

2012-08-21 Thread Matthias Brantner
Review: Needs Fixing Could you please add the fix to the ChangeLog? -- https://code.launchpad.net/~zorba-coders/zorba/bug-1039488/+merge/120548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to :

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Matthias Brantner
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe :

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fn-serialize-json into lp:zorba

2012-08-21 Thread Matthias Brantner
I would like to finish the discussion about serialization before we merge this fix. -- https://code.launchpad.net/~zorba-coders/zorba/fn-serialize-json/+merge/120569 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to :

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Matthias Brantner
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe :

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Till Westmann
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe :

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/create-user-typed-atomic-item into lp:zorba

2012-08-21 Thread Matthias Brantner
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/create-user-typed-atomic-item/+merge/120560 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe :

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zdst0006-message-2012-08-21T16-17-42.204Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 Your team Zorba Coders is subscribed to branch lp:zorba. --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba

2012-08-21 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/user-typed-atomic-item-is-encoded into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/user-typed-atomic-item-is-encoded/+merge/120577 --

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue job zdst0006-message-2012-08-21T16-17-42.204Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

2012-08-21 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/zdst0006-message into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zdst0006-message/+merge/120572 --

[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba

2012-08-21 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba. Requested reviews: Zorba Coders (zorba-coders) Related bugs: Bug #898792 in Zorba: xs:QName fails for non-literal input https://bugs.launchpad.net/zorba/+bug/898792 Bug #931501 in Zorba: improve error message for

Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2012-08-21 Thread Matthias Brantner
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2012-08-21 Thread Matthias Brantner
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 Your team

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-08-21T22-21-50.494Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list:

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2012-08-21 Thread Zorba Build Bot
Validation queue job pjl-misc-2012-08-21T22-21-50.494Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders

[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2012-08-21 Thread noreply
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491 Your team Zorba

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba

2012-08-21 Thread Matthias Brantner
1. Are the things you compile/link against on Windows and Mac guaranteed to exist? (ie, do I only need to find libuuid on Linux platforms) Yes. 2. What should happen if I *don't* find it? Can the UUID code be made optional at compile time? Would that mean we need a ZORBA_WITH_UUID or

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba

2012-08-21 Thread Chris Hillery
Also, as far as I understood, we already depended on libuuid before. As far as I can tell, no, we didn't. But, if we should have a hard requirement, so be it. As I said, it looks like it's pretty much standard on Linux. --

Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba

2012-08-21 Thread Chris Hillery
Please don't leave commented-out code in there; just delete it (it's still in Bazaar and can be recovered if necessary). Why is this merge proposal associated with bug 931501? Mistake I guess, since that bug is Fix Released? -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/120668 Your

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba

2012-08-21 Thread Paul J. Lucas
As far as I can tell, no, we didn't. But, if we should have a hard requirement, so be it. As I said, it looks like it's pretty much standard on Linux. Chris: Can you therefore please add the CMake magic to test for libuuid when not on Mac/Windows? Thanks. --

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba

2012-08-21 Thread Chris Hillery
Review: Needs Fixing Turns out this is less standard than I thought. On my standard Ubuntu installation, I cannot compile this branch without installing the uuid-dev Ubuntu package, which is where uuid/uuid.h comes from. I have added a bit of CMake stuff to check that -luuid works if