[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/104/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 :
Votes: {'Approve': 1}
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883
:
Votes: {'Approve': 1}
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884
:
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885
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
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors-queue into lp:zorba/queue-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884 Your team Zorba Coders is subscribed to branch lp:zorba/queue-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 Your team Zorba Coders is subscribed to branch lp:zorba/stack-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/zorba-errors into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors-queue into lp:zorba/queue-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/zorba-errors-queue into lp:zorba/queue-module. Commit message: Update to new zorba errors URI. Requested reviews: Zorba Coders (zorba-coders) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/zorba-errors-queue into lp:zorba/queue-module. === modified file 'test/Queries/pop1.spec' --- test/Queries/pop1.spec 2013-07-17 06:19:53 + +++ test/Queries/pop1.spec 2013-08-07 05:28:27 + @@ -1,1 +1,1 @@ -Error: http://zorba.io/modules/zorba-errors:ZDDY0011 +Error: http://zorba.io/errors:ZDDY0011 -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module
The proposal to merge lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module has been updated. Commit Message changed to: Update to new zorba errors URI. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module. Commit message: Update to new zorba errors URI. Requested reviews: Zorba Coders (zorba-coders) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/zorba-errors-stack into lp:zorba/stack-module. === modified file 'test/Queries/pop1.spec' --- test/Queries/pop1.spec 2013-07-17 06:20:08 + +++ test/Queries/pop1.spec 2013-08-07 05:27:27 + @@ -1,1 +1,1 @@ -Error: http://zorba.io/modules/zorba-errors:ZDDY0011 +Error: http://zorba.io/errors:ZDDY0011 -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
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/178871 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
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/178871 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Optimization for same sentence/paragraph.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871
Optimization for same sentence/paragraph.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/178871
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/full_text/apply.cpp'
--- src/runtime/full_text/apply.cpp 2013-06-12 00:21:05 +
+++ src/runtime/full_text/apply.cpp 2013-08-07 01:20:38 +
@@ -770,9 +770,12 @@
FOR_EACH( ft_all_matches, m, am ) {
bool every_satisfies = true;
-FOR_EACH( ft_match::includes_t, i1, m->includes ) {
- FOR_EACH( ft_match::includes_t, i2, m->includes ) {
-if ( &*i1 != &*i2 && !same( *i1, *i2, sep ) ) {
+if ( m->includes.size() > 1 ) {
+ ft_match::includes_t::const_iterator i( m->includes.begin() );
+ ft_match::includes_t::const_iterator const end( m->includes.end() );
+ ft_match::includes_t::value_type const &first = *i;
+ while ( ++i != end ) {
+if ( !same( first, *i, sep ) ) {
every_satisfies = false;
break;
}
=== modified file 'src/runtime/full_text/ft_match.h'
--- src/runtime/full_text/ft_match.h 2013-02-07 17:24:36 +
+++ src/runtime/full_text/ft_match.h 2013-08-07 01:20:38 +
@@ -19,6 +19,7 @@
#include
#include
+#include
#include "ft_token_span.h"
@@ -65,7 +66,7 @@
/**
* An %ft_string_matches contains zero or more ft_string_match objects.
*/
-typedef std::list ft_string_matches;
+typedef std::vector ft_string_matches;
///
@@ -94,7 +95,7 @@
if ( !includes_sorted_ ) {
includes_sorted_ = true;
#endif
- includes.sort();
+ std::sort( includes.begin(), includes.end() );
#if FT_MATCH_OPTIMIZE_SORT
}
#endif
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/102/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120
:
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120
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
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/101/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120
:
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120
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
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-win64 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-win64 into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-win64 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/win64-build into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/win64-build into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/win64-build/+merge/174890 -- https://code.launchpad.net/~zorba-coders/zorba/win64-build/+merge/174890 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-win64 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-win64 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-win64 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module
The proposal to merge lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-942171 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Stage "TestZorbaUbuntu" failed. 1 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/176/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module
The proposal to merge lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-942171 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-win64 into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-win64 into
lp:zorba.
Commit message:
Fixes for Windows64
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846
Fixes for Windows64
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCPack.cmake'
--- CMakeCPack.cmake 2013-02-07 17:24:36 +
+++ CMakeCPack.cmake 2013-08-06 20:42:37 +
@@ -83,6 +83,11 @@
SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPES Full)
SET(CPACK_COMPONENT_CSHARP_SWIG_INSTALL_TYPES Full)
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_GROUP "external_modules")
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DISPLAY_NAME "schema tools module")
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DESCRIPTION "Install the functionalities of the schema tools module.")
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_INSTALL_TYPES Full)
+
INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
@@ -103,7 +108,7 @@
IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
IF(CMAKE_CL_64)
- SET(CPACK_SYSTEM_NAME win64-${CMAKE_SYSTEM_PROCESSOR})
+ SET(CPACK_SYSTEM_NAME win64-x64)
ELSE(CMAKE_CL_64)
SET(CPACK_SYSTEM_NAME win32-${CMAKE_SYSTEM_PROCESSOR})
ENDIF(CMAKE_CL_64)
=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake 2013-02-07 17:24:36 +
+++ cmake_modules/Windows/ProxyFindModule.cmake 2013-08-06 20:42:37 +
@@ -123,6 +123,21 @@
# if not already provided add the program files directory
SET (SEARCH_PATHS ${ZORBA_THIRD_PARTY_REQUIREMENTS})
+
+ STRING (REGEX MATCHALL "machine:x64" MACHINE_X64_FOUND "${CMAKE_EXE_LINKER_FLAGS}")
+ IF(MACHINE_X64_FOUND)
+LIST (FIND SEARCH_PATHS "C:/Program Files" PRORAM_FILES_FOUND)
+IF (PRORAM_FILES_FOUND EQUAL -1)
+ SET (SEARCH_PATHS "${SEARCH_PATHS}" "C:/Program Files")
+ENDIF (PRORAM_FILES_FOUND EQUAL -1)
+ ELSE(MACHINE_X64_FOUND)
+LIST (FIND SEARCH_PATHS "$ENV{ProgramFiles}" PRORAM_FILES_FOUND)
+IF (PRORAM_FILES_FOUND EQUAL -1)
+ SET (SEARCH_PATHS "${SEARCH_PATHS}" "$ENV{ProgramFiles}")
+ENDIF (PRORAM_FILES_FOUND EQUAL -1)
+ ENDIF(MACHINE_X64_FOUND)
+
+
LIST (FIND SEARCH_PATHS "$ENV{ProgramFiles}" PRORAM_FILES_FOUND)
IF (PRORAM_FILES_FOUND EQUAL -1)
SET (SEARCH_PATHS "${SEARCH_PATHS}" "$ENV{ProgramFiles}")
=== modified file 'src/debugger/socket.h'
--- src/debugger/socket.h 2013-02-07 17:24:36 +
+++ src/debugger/socket.h 2013-08-06 20:42:37 +
@@ -21,12 +21,16 @@
#include
-#ifdef WIN32
+#ifdef _WIN64
+ typedef unsigned __int64 SOCKET;
+#else
+#ifdef _WIN32
typedef unsigned int __w64 SOCKET;
#else
# define INVALID_SOCKET -1
typedef int SOCKET;
#endif
+#endif
namespace zorba {
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba. Commit message: Windows move for cmake Requested reviews: Juan Zacarias (juan457) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 Windows fix for cmake -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 Your team Zorba Coders is subscribed to branch lp:zorba. === renamed file 'modules/com/zorba-xquery/www/modules/cacert.pem' => 'modules/http-client/cacert.pem' -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/archive-module-win64
into lp:zorba/archive-module.
Commit message:
Fixes for Windows64
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845
Fixes for Windows64
--
https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.
=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp 2013-07-31 22:00:40 +
+++ src/archive_module.xq.src/archive_module.cpp 2013-08-06 20:42:32 +
@@ -27,9 +27,11 @@
# include
#endif
#ifdef WIN32
-# include
+# include "strptime.h"
+#ifndef _WIN64
# include
#endif
+#endif
#include
#include
@@ -890,11 +892,8 @@
ArchiveFunction::checkForError(lErr, 0, a);
}
-#ifdef WIN32
- long
-#else
- ssize_t
-#endif
+
+ _ssize_t
ArchiveItemSequence::readStream(struct archive*, void *data, const void **buff)
{
ArchiveItemSequence::CallbackData* lData =
@@ -987,11 +986,8 @@
theArchive = 0;
}
-#ifdef WIN32
- long
-#else
- ssize_t
-#endif
+
+ _ssize_t
ArchiveFunction::writeStream(
struct archive *,
void *func,
=== modified file 'src/archive_module.xq.src/archive_module.h'
--- src/archive_module.xq.src/archive_module.h 2013-07-29 19:24:56 +
+++ src/archive_module.xq.src/archive_module.h 2013-08-06 20:42:32 +
@@ -32,9 +32,16 @@
#define ZORBA_ARCHIVE_COMPRESSION_DEFLATE 50
#define ZORBA_ARCHIVE_COMPRESSION_STORE 51
-
namespace zorba { namespace archive {
+#ifdef _WIN64
+ typedef long long _ssize_t;
+#elif WIN32
+ typedef long _ssize_t;
+#else
+ typedef ssize_t _ssize_t;
+#endif
+
/***
**/
class ArchiveModule : public ExternalModule {
@@ -165,11 +172,8 @@
virtual ~ArchiveItemSequence() {}
protected:
-#ifdef WIN32
- static long
-#else
- static ssize_t
-#endif
+
+ static _ssize_t
readStream(struct archive *a, void *client_data, const void **buff);
// needed for the "non-linear" zip format
@@ -323,11 +327,8 @@
static zorba::Item
getOneItem(const Arguments_t& aArgs, int aIndex);
-#ifdef WIN32
- static long
-#else
- static ssize_t
-#endif
+
+ static _ssize_t
writeStream(struct archive *a, void *client_data, const void *buff, size_t n);
static int
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/95/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 :
Votes: {'Approve': 1}
https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 :
Votes: {'Approve': 1}
https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 :
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637
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
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Stage "TestZorbaUbuntu" failed. 13 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/171/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Stage "TestZorbaUbuntu" failed. 13 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/170/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 Stage "TestZorbaUbuntu" failed. 13 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/169/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Review: Approve It works like a charm! -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module has been updated. Commit Message changed to: - Use new zorba.io namespace. - Upgrade to latest Oracle Nosql DB version: kv-2.1.8. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 -- https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/zio-oracle-nosql into
lp:zorba/oracle-nosql-db-module.
Commit message:
- Use new zorba.io namespace.
- Upgrade to latest Oracle Nosql DB version: kv-2.1.8.
Requested reviews:
Cezar Andrei (cezar-andrei)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785
- Use new zorba.io namespace.
- Upgrade to latest Oracle Nosql DB version: kv-2.1.8.
--
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785
Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-12-17 20:35:19 +
+++ CMakeLists.txt 2013-08-06 15:39:30 +
@@ -29,7 +29,7 @@
MESSAGE (STATUS "NOSQLDB_HOME = " $ENV{NOSQLDB_HOME})
IF (WIN32)
- SET (NOSQLDB_PATH "$ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}\\lib C:\\Libs\\kv-1.2.123 C:\\dev\\libraries\\nosqldb C:\\dev\\libraries\\nosqldb\\lib")
+ SET (NOSQLDB_PATH "$ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}\\lib C:\\Libs\\kv-2.1.8 C:\\dev\\libraries\\nosqldb C:\\dev\\libraries\\nosqldb\\lib")
MESSAGE (STATUS "pdfbox fontbox jars searching path: " ${NOSQLDB_PATH} )
ELSE (WIN32)
SET (NOSQLDB_PATH $ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}/lib
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-11-21 21:58:30 +
+++ src/CMakeLists.txt 2013-08-06 15:39:30 +
@@ -27,7 +27,7 @@
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
DECLARE_ZORBA_MODULE (
- URI "http://www.zorba-xquery.com/modules/oracle-nosqldb";
+ URI "http://zorba.io/modules/oracle-nosqldb";
VERSION 1.0
FILE "nosqldb.xq"
### CONFIG_FILES ../srcJava/org/zorbaxquery/modules/nosqldb/Config.java.in
=== modified file 'src/nosqldb.xq'
--- src/nosqldb.xq 2013-07-17 07:53:12 +
+++ src/nosqldb.xq 2013-08-06 15:39:30 +
@@ -17,7 +17,9 @@
(:~
- : This module provides minimal functionality to interact with an http://www.oracle.com/technetwork/products/nosqldb/overview/index.html";>Oracle NoSQL Database.
+ : This module provides minimal functionality to interact with an
+ : http://www.oracle.com/technetwork/products/nosqldb/overview/index.html";>
+ : Oracle NoSQL Database.
:
: Oracle NoSQL Database is built upon the proven Oracle Berkeley DB Java Edition
: high-availability storage engine, which is in widespread use in enterprises across
@@ -25,7 +27,8 @@
: The resulting solution provides distributed, highly available key/value storage that is well
: suited to large-volume, latency-sensitive applications.
:
- : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME environment variable to use this module.
+ : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME
+ : environment variable when compilling this module.
:
:
: Note: Since this module has a Java library dependency a JVM required
@@ -35,7 +38,7 @@
: @author Cezar Andrei
: @project DB Drivers/ORACLE NoSQL
:)
-module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
(:~
: Import module for encoding/decoding base64Binary to/from string.
=== modified file 'src/nosqldb.xq.src/nosqldb.h'
--- src/nosqldb.xq.src/nosqldb.h 2013-06-12 13:59:19 +
+++ src/nosqldb.xq.src/nosqldb.h 2013-08-06 15:39:30 +
@@ -37,7 +37,7 @@
#include "JavaVMSingleton.h"
-#define NOSQLDB_MODULE_NAMESPACE "http://www.zorba-xquery.com/modules/oracle-nosqldb";
+#define NOSQLDB_MODULE_NAMESPACE "http://zorba.io/modules/oracle-nosqldb";
namespace zorba
=== modified file 'test/Queries/oracle-nosql-db/all-binary.xq'
--- test/Queries/oracle-nosql-db/all-binary.xq 2013-07-17 07:53:12 +
+++ test/Queries/oracle-nosql-db/all-binary.xq 2013-08-06 15:39:30 +
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
import module namespace base64 = "http://zorba.io/modules/base64";;
{
=== modified file 'test/Queries/oracle-nosql-db/all-text.xq'
--- test/Queries/oracle-nosql-db/all-text.xq 2013-07-17 07:53:12 +
+++ test/Queries/oracle-nosql-db/all-text.xq 2013-08-06 15:39:30 +
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
import module namespace base64 = "http://zorba.io/modules/base64";;
{
=== modified file 'test/Queries/oracle-nosql-db/connect.xq'
--- test/Queries/oracle-nosql-db/connect.xq 2013-01-09 17:56:22 +
+++ test/Queries/oracle-nosql-db/connect.xq 2013-08-06 15:39:30 +
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
{
va
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-html into lp:zorba/html-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-942171-html into
lp:zorba/html-module.
Commit message:
Changed file:write() to file:write-text().
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775
Changed file:write() to file:write-text().
--
https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775
Your team Zorba Coders is subscribed to branch lp:zorba/html-module.
=== modified file 'test/Queries/link_crawler2.xq2'
--- test/Queries/link_crawler2.xq2 2012-08-04 02:23:35 +
+++ test/Queries/link_crawler2.xq2 2013-08-06 14:53:49 +
@@ -255,9 +255,14 @@
local:delete-containers();
-file:write(fn:resolve-uri("link_crawler_result.xml"),
-{$result},
-
-
-)
+file:write-text(
+ fn:resolve-uri("link_crawler_result.xml"),
+ serialize(
+{$result},
+
+
+
+ )
+)
+(: vim:set syntax=xquery et sw=2 ts=2: :)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-942171 into lp:zorba has been updated. Description changed to: Added arbitrary encoding support. Added missing functions from spec. https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773 https://code.launchpad.net/~zorba-coders/zorba/bug-942171-html/+merge/178775 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 -- https://code.launchpad.net/~zorba-coders/zorba/bug-942171/+merge/178637 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-942171-csv into lp:zorba/csv-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-942171-csv into
lp:zorba/csv-module.
Commit message:
Changed file:write() to file:write-text().
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773
Changed file:write() to file:write-text().
--
https://code.launchpad.net/~zorba-coders/zorba/bug-942171-csv/+merge/178773
Your team Zorba Coders is subscribed to branch lp:zorba/csv-module.
=== modified file 'test/Queries/converters/base64/common.xqlib'
--- test/Queries/converters/base64/common.xqlib 2012-04-11 09:49:40 +
+++ test/Queries/converters/base64/common.xqlib 2013-08-06 14:52:28 +
@@ -37,7 +37,7 @@
};
declare %an:sequential function commons:testWriteXml($path as xs:string, $xml as item()) as xs:string* {
- file:write($path, $xml, ());
+ file:write-text($path, serialize($xml));
"SUCCESS"
};
@@ -65,12 +65,15 @@
};
declare %an:sequential function commons:testWriteSerializeXml($path as xs:string, $xml as item()) as xs:string* {
- file:write(
+ file:write-text(
$path,
-$xml,
-
-
-);
+serialize(
+ $xml,
+
+
+
+)
+ );
"SUCCESS";
};
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Stage "TestZorbaUbuntu" failed. tests failed ( total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/168/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into lp:zorba. Commit message: destroy the XmlDataManager before shuting down the store in zorbacmd Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 destroy the XmlDataManager before shuting down the store in zorbacmd -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd.cpp' --- bin/zorbacmd.cpp 2013-08-06 09:10:25 + +++ bin/zorbacmd.cpp 2013-08-06 13:26:52 + @@ -1301,6 +1301,8 @@ lAuditProvider->destroyConfiguration(config); #endif + xmlDataMgr = NULL; + lZorbaInstance->shutdown(); zorba::StoreManager::shutdownStore(store); -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Description changed to: removed StaticContextImpl::checkInvokable() method ==> small optimization for invoke() changed static base uri for root static context For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Commit Message changed to: removed StaticContextImpl::checkInvokable() method ==> small optimization for invoke() changed static base uri for root static context For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
removed StaticContextImpl::checkInvokable() method ==> small optimization for
invoke()
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692
removed StaticContextImpl::checkInvokable() method ==> small optimization for
invoke()
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178692
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2013-08-05 11:24:53 +
+++ bin/zorbacmd.cpp 2013-08-06 08:48:31 +
@@ -904,13 +904,14 @@
ItemSequence_t docsSeq = docMgr->availableDocuments();
Iterator_t lIter = docsSeq->getIterator();
lIter->open();
+
Item uri;
std::vector docURIs;
- while (lIter->next(uri))
+ while (docsIter->next(uri))
{
docURIs.push_back(uri);
}
- lIter->close();
+ docsIter->close();
size_t numDocs = docURIs.size();
=== modified file 'doc/cxx/examples/datamanager.cpp'
--- doc/cxx/examples/datamanager.cpp 2013-08-05 11:24:53 +
+++ doc/cxx/examples/datamanager.cpp 2013-08-06 08:48:31 +
@@ -51,7 +51,7 @@
Item lDoc = aDataManager->parseXML(lInStream);
// (2) bind the document in the store using the DocumentManager
-DocumentManager* lDocMgr = aDataManager->getDocumentManager();
+DocumentManager_t lDocMgr = aZorba->getDocumentManager();
lDocMgr->put("books.xml", lDoc);
// (3) doc('books.xml') accesses the previously found document
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2013-08-05 11:54:06 +
+++ src/api/staticcontextimpl.cpp 2013-08-06 08:48:31 +
@@ -962,6 +962,9 @@
}
+/***
+
+/
void
StaticContextImpl::getFunctions(
const String& aFnNameUri,
@@ -992,6 +995,9 @@
}
+/***
+
+/
void
StaticContextImpl::getFunctionAnnotations(
const Item& aQName,
@@ -1020,6 +1026,9 @@
}
+/***
+
+/
void
StaticContextImpl::setContextItemStaticType(TypeIdentifier_t type)
{
@@ -1032,6 +1041,9 @@
}
+/***
+
+/
TypeIdentifier_t
StaticContextImpl::getContextItemStaticType() const
{
@@ -1044,6 +1056,9 @@
}
+/***
+
+/
void
StaticContextImpl::setTraceStream(std::ostream& os)
{
@@ -1051,6 +1066,9 @@
}
+/***
+
+/
void
StaticContextImpl::resetTraceStream()
{
@@ -1058,6 +1076,9 @@
}
+/***
+
+/
bool
StaticContextImpl::getOption(const Item& aQName, String& aOptionValue) const
{
@@ -1083,6 +1104,9 @@
}
+/***
+
+/
void
StaticContextImpl::declareOption(const Item& aQName, const String& aOptionValue)
{
@@ -1099,6 +1123,9 @@
}
+/***
+
+/
void StaticContextImpl::loadProlog(
const String& prolog,
const Zorba_CompilerHints_t& hints)
@@ -1119,6 +1146,9 @@
}
+/***
+
+/
static void
toInternalPath(
const std::vector& aPublicStrings,
@@ -1140,6 +1170,9 @@
}
+/***
+
+/
static void
toPublicPath(
const std::vector& aInternalStrings,
@@ -1153,6 +1186,9 @@
}
+/***
+
+***
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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 More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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 More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 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 More help : https://help.launchpad.net/ListHelp
