[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/177668 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/new-base64-api-archive into lp:zorba/archive-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-archive/+merge/177949 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/new-base64-api-data-formatting into lp:zorba/data-formatting-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-data-formatting/+merge/177951 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-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/new-base64-api-email into lp:zorba/email-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-email/+merge/177673 Your team Zorba Coders is subscribed to branch lp:zorba/email-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/new-base64-api-image into lp:zorba/image-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-image/+merge/177676 Your team Zorba Coders is subscribed to branch lp:zorba/image-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/new-base64-api-read-pdf into lp:zorba/read-pdf-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-read-pdf/+merge/177960 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/new-base64-api-nosqldb into lp:zorba/oracle-nosql-db-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-nosqldb/+merge/177946 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/new-base64-api into lp:zorba/security-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api/+merge/177667 Your team Zorba Coders is subscribed to branch lp:zorba/security-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/new-base64-api-email into lp:zorba/email-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api-email into lp:zorba/email-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-email/+merge/177673 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-email/+merge/177673 Your team Zorba Coders is subscribed to branch lp:zorba/email-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/new-base64-api-nosqldb into lp:zorba/oracle-nosql-db-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api-nosqldb into lp:zorba/oracle-nosql-db-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-nosqldb/+merge/177946 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-nosqldb/+merge/177946 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/new-base64-api-image into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api-image into lp:zorba/image-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-image/+merge/177676 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-image/+merge/177676 Your team Zorba Coders is subscribed to branch lp:zorba/image-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/new-base64-api-data-formatting into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api-data-formatting into lp:zorba/data-formatting-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-data-formatting/+merge/177951 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-data-formatting/+merge/177951 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-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:~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/177668 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/177668 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/new-base64-api into lp:zorba/security-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api into lp:zorba/security-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api/+merge/177667 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api/+merge/177667 Your team Zorba Coders is subscribed to branch lp:zorba/security-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/new-base64-api-archive into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api-archive into lp:zorba/archive-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-archive/+merge/177949 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-archive/+merge/177949 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/new-base64-api-read-pdf into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/new-base64-api-read-pdf into lp:zorba/read-pdf-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-read-pdf/+merge/177960 -- https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-read-pdf/+merge/177960 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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:~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/177668 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-read-pdf/+merge/177960 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-data-formatting/+merge/177951 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-archive/+merge/177949 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api/+merge/177667 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-email/+merge/177673 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-image/+merge/177676 https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-nosqldb/+merge/177946 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/177668 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/177668 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/177668 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/177668 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/177668 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. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133 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/178133 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/178133 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133 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/178133 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: renamed files implementing our various item iterators + cosmetic Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133 renamed files implementing our various item iterators + cosmetic -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/api/CMakeLists.txt' --- src/api/CMakeLists.txt 2013-08-01 11:39:44 + +++ src/api/CMakeLists.txt 2013-08-01 17:29:31 + @@ -23,7 +23,6 @@ sax2impl.cpp staticcontextimpl.cpp dynamiccontextimpl.cpp -resultiteratorimpl.cpp zorba_string.cpp hexbinaryimpl.cpp hexbinary_streambuf.cpp @@ -39,10 +38,11 @@ collectionimpl.cpp options.cpp functionimpl.cpp -storeiteratorimpl.cpp -vectoriterator.cpp -iterator_singleton.cpp serialization_callback.cpp +item_iter_singleton.cpp +item_iter_vector.cpp +item_iter_store.cpp +item_iter_query_result.cpp item_seq_vector.cpp item_seq_singleton.cpp item_seq_invoke.cpp === modified file 'src/api/dynamiccontextimpl.cpp' --- src/api/dynamiccontextimpl.cpp 2013-08-01 07:57:57 + +++ src/api/dynamiccontextimpl.cpp 2013-08-01 17:29:31 + @@ -32,10 +32,8 @@ #include "api/unmarshaller.h" #include "api/zorbaimpl.h" #include "api/xqueryimpl.h" -#include "api/resultiteratorimpl.h" -#include "api/storeiteratorimpl.h" -//#include "api/item_iter_query_result.h" -//#include "api/item_iter_store.h" +#include "api/item_iter_query_result.h" +#include "api/item_iter_store.h" #include "api/dynamiccontextimpl.h" #include "compiler/parser/query_loc.h" === modified file 'src/api/item.cpp' --- src/api/item.cpp 2013-06-21 05:17:24 + +++ src/api/item.cpp 2013-08-01 17:29:31 + @@ -28,8 +28,8 @@ #include "api/zorbaimpl.h" #include "api/serialization/serializer.h" -#include "api/storeiteratorimpl.h" -#include "api/iterator_singleton.h" +#include "api/item_iter_store.h" +#include "api/item_iter_singleton.h" #include "api/unmarshaller.h" #include "store/api/item.h" === renamed file 'src/api/resultiteratorimpl.cpp' => 'src/api/item_iter_query_result.cpp' --- src/api/resultiteratorimpl.cpp 2013-02-07 17:24:36 + +++ src/api/item_iter_query_result.cpp 2013-08-01 17:29:31 + @@ -22,7 +22,7 @@ #include "system/globalenv.h" -#include "api/resultiteratorimpl.h" +#include "api/item_iter_query_result.h" #include "api/unmarshaller.h" #include "api/xqueryimpl.h" #include "api/zorbaimpl.h" === renamed file 'src/api/resultiteratorimpl.h' => 'src/api/item_iter_query_result.h' === renamed file 'src/api/iterator_singleton.cpp' => 'src/api/item_iter_singleton.cpp' --- src/api/iterator_singleton.cpp 2013-02-07 17:24:36 + +++ src/api/item_iter_singleton.cpp 2013-08-01 17:29:31 + @@ -15,11 +15,10 @@ */ #include "stdafx.h" -#include "api/iterator_singleton.h" - #include #include "api/zorbaimpl.h" +#include "api/item_iter_singleton.h" #include "system/globalenv.h" === renamed file 'src/api/iterator_singleton.h' => 'src/api/item_iter_singleton.h' === renamed file 'src/api/storeiteratorimpl.cpp' => 'src/api/item_iter_store.cpp' --- src/api/storeiteratorimpl.cpp 2013-02-07 17:24:36 + +++ src/api/item_iter_store.cpp 2013-08-01 17:29:31 + @@ -15,12 +15,11 @@ */ #include "stdafx.h" -#include "api/storeiteratorimpl.h" - #include #include "system/globalenv.h" +#include "api/item_iter_store.h" #include "api/zorbaimpl.h" #include "diagnostics/xquery_diagnostics.h" @@ -73,7 +72,7 @@ / StoreIteratorImpl::StoreIteratorImpl( -store::Iterator_t aIter, +const store::Iterator_t& aIter, DiagnosticHandler* aDiagnosticHandler) : theIterator(aIter), === renamed file 'src/api/storeiteratorimpl.h' => 'src/api/item_iter_store.h' --- src/api/storeiteratorimpl.h 2013-02-07 17:24:36 + +++ src/api/item_iter_store.h 2013-08-01 17:29:31 + @@ -34,15 +34,15 @@ friend class DynamicContextImpl; protected: - store::Iterator_t theIterator; - DiagnosticHandler* theDiagnosticHandler; - bool theOwnDiagnosticHandler; - bool theIsOpen; - bool theHaveLock; + store::Iterator_t theIterator; + DiagnosticHandler * theDiagnosticHandler; + booltheOwnDiagnosticHandler; + booltheIsOpen; + booltheHaveLock; - StoreIteratorImpl(store::Iterator_t, DiagnosticHandler*); - public: + StoreIteratorImpl(const store::Iterator_t&, DiagnosticHandler*); + virtual ~StoreIteratorImpl(); virtual void open(); === renamed file 'src/api/vectoriterator.cpp' => 'src/api/item_iter_vector.cpp' --- src/api/vectorit
[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/178048 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178048 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/178048 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. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178048 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178048 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/178048 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:
renamed item_sequence_chainer.h + cosmetic
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178048
renamed item_sequence_chainer.h + cosmetic
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178048
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/item_seq_chainer.cpp'
--- src/api/item_seq_chainer.cpp 2013-08-01 11:24:18 +
+++ src/api/item_seq_chainer.cpp 2013-08-01 12:01:31 +
@@ -16,7 +16,7 @@
#include "stdafx.h"
#include
-#include "api/item_sequence_chainer.h"
+#include "api/item_seq_chainer.h"
#include
namespace zorba {
=== renamed file 'src/api/item_sequence_chainer.h' => 'src/api/item_seq_chainer.h'
--- src/api/item_sequence_chainer.h 2013-02-07 17:24:36 +
+++ src/api/item_seq_chainer.h 2013-08-01 12:01:31 +
@@ -29,84 +29,84 @@
namespace zorba {
- /** \brief
- *
- * See ItemSequence
+/** \brief
+ *
+ * See ItemSequence
+ */
+class ZORBA_DLL_PUBLIC ItemSequenceChainer : public ItemSequence
+{
+ public:
+ /**
*/
- class ZORBA_DLL_PUBLIC ItemSequenceChainer : public ItemSequence
- {
-public:
- /**
- */
- ItemSequenceChainer(
+ ItemSequenceChainer(
const std::vector& aSequences,
bool aDoDupElim = false);
- /** \brief Destructor
- */
- virtual ~ItemSequenceChainer();
-
- /** \brief get the Iterator over the items
- * @return an iterator over the items
- */
- virtual Iterator_t getIterator();
-
-protected:
- std::vector theSequences;
- booltheDoDupElim;
-
-protected:
- class Iterator : public zorba::Iterator
- {
-public:
- Iterator(
+ /** \brief Destructor
+ */
+ virtual ~ItemSequenceChainer();
+
+ /** \brief get the Iterator over the items
+ * @return an iterator over the items
+ */
+ virtual Iterator_t getIterator();
+
+ protected:
+ std::vector theSequences;
+ booltheDoDupElim;
+
+ protected:
+ class Iterator : public zorba::Iterator
+ {
+ public:
+Iterator(
const std::vector& aSequences,
bool aDoDupElim);
- virtual ~Iterator();
-
- virtual void
- open();
-
- virtual bool
- next(Item& aItem);
+virtual ~Iterator();
+
+virtual void
+open();
+
+virtual bool
+next(Item& aItem);
- virtual void
- close();
-
- virtual bool
- isOpen() const;
-
-protected:
- std::vector theSequences;
- std::vector::iterator theSeqIter;
- zorba::Iterator_t theIter;
- bool theIsOpen;
- bool theDoDupElim;
-
- struct Comparator {
-bool operator()(const Item& i1, const Item& i2) const
-{
- assert(i1.getType().getLocalName() == "QName");
- assert(i2.getType().getLocalName() == "QName");
- int lNamespaceComparison = i1.getNamespace().compare(i2.getNamespace());
- if (lNamespaceComparison < 0)
- {
-return true;
- }
- if (lNamespaceComparison > 0)
- {
-return false;
- }
- // Namespaces are equal, comparing local names.
- return (i1.getLocalName().compare(i2.getLocalName()) < 0);
-}
- };
-
- std::set theDupElimSet;
- };
- }; /* class ItemSequenceChainer */
-
+virtual void
+close();
+
+virtual bool
+isOpen() const;
+
+ protected:
+std::vector theSequences;
+std::vector::iterator theSeqIter;
+zorba::Iterator_t theIter;
+bool theIsOpen;
+bool theDoDupElim;
+
+struct Comparator {
+ bool operator()(const Item& i1, const Item& i2) const
+ {
+assert(i1.getType().getLocalName() == "QName");
+assert(i2.getType().getLocalName() == "QName");
+int lNamespaceComparison = i1.getNamespace().compare(i2.getNamespace());
+if (lNamespaceComparison < 0)
+{
+ return true;
+}
+if (lNamespaceComparison > 0)
+{
+ return false;
+}
+// Namespaces are equal, comparing local names.
+return (i1.getLocalName().compare(i2.getLocalName()) < 0);
+ }
+};
+
+std::set theDupElimSet;
+ };
+}; /* class ItemSequenceChainer */
+
} // namespace zorba
#endif
=== modified file 'src/api/staticcollectionmanagerimpl.cpp'
--- src/api/staticcollectionmanagerimpl.
[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/178040 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178040 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/178040 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/178040 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178040 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/178040 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:
renamed files implementing our various item sequences + fixed bug in
SingletonItemSequence::next()
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178040
renamed files implementing our various item sequences + fixed bug in
SingletonItemSequence::next()
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178040
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/xqxq/xqxq.xq.src/xqxq.cpp'
--- modules/xqxq/xqxq.xq.src/xqxq.cpp 2013-05-28 00:58:27 +
+++ modules/xqxq/xqxq.xq.src/xqxq.cpp 2013-08-01 11:25:40 +
@@ -424,6 +424,7 @@
lIter->open();
lIter->next(lItem);
lIter->close();
+ lIter = NULL;
if (lItem.isNull())
return NULL;
=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt 2013-06-21 06:20:46 +
+++ src/api/CMakeLists.txt 2013-08-01 11:25:40 +
@@ -43,11 +43,11 @@
vectoriterator.cpp
iterator_singleton.cpp
serialization_callback.cpp
-vector_item_sequence.cpp
-singleton_item_sequence.cpp
-invoke_item_sequence.cpp
-item_sequence_chainer.cpp
-empty_sequence.cpp
+item_seq_vector.cpp
+item_seq_singleton.cpp
+item_seq_invoke.cpp
+item_seq_chainer.cpp
+item_seq_empty.cpp
serializerimpl.cpp
base64impl.cpp
base64_streambuf.cpp
=== renamed file 'src/api/item_sequence_chainer.cpp' => 'src/api/item_seq_chainer.cpp'
=== renamed file 'src/api/empty_sequence.cpp' => 'src/api/item_seq_empty.cpp'
--- src/api/empty_sequence.cpp 2013-08-01 10:36:40 +
+++ src/api/item_seq_empty.cpp 2013-08-01 11:25:40 +
@@ -17,34 +17,45 @@
#include
#include
+
#include "diagnostics/assert.h"
-namespace zorba {
+namespace zorba
+{
Iterator_t EmptySequence::getIterator()
{
return new InternalIterator(this);
}
-EmptySequence::InternalIterator::InternalIterator(ItemSequence *item_sequence) : theItemSequence(item_sequence)
-{
- theIsOpen = false;
-}
+
+EmptySequence::InternalIterator::InternalIterator(ItemSequence* seq)
+ :
+ theItemSequence(seq),
+ theIsOpen(false)
+{
+}
+
+
+bool EmptySequence::InternalIterator::isOpen() const
+{
+ return theIsOpen;
+}
+
void EmptySequence::InternalIterator::open()
{
+ ZORBA_ASSERT(!theIsOpen);
theIsOpen = true;
}
+
void EmptySequence::InternalIterator::close()
{
+ ZORBA_ASSERT(theIsOpen);
theIsOpen = false;
}
-bool EmptySequence::InternalIterator::isOpen() const
-{
- return theIsOpen;
-}
bool EmptySequence::InternalIterator::next(Item& aItem)
{
=== renamed file 'src/api/invoke_item_sequence.cpp' => 'src/api/item_seq_invoke.cpp'
--- src/api/invoke_item_sequence.cpp 2013-02-07 17:24:36 +
+++ src/api/item_seq_invoke.cpp 2013-08-01 11:25:40 +
@@ -16,30 +16,30 @@
#include "stdafx.h"
#include
-#include "api/invoke_item_sequence.h"
+
+#include "api/item_seq_invoke.h"
#include "api/xqueryimpl.h"
#include "api/staticcontextimpl.h"
-namespace zorba {
+namespace zorba
+{
-InvokeItemSequence::InvokeItemSequence(
-XQueryImpl* aQuery,
-Iterator_t aIter,
-StaticContext* aSctx)
- : theIterator(aIter),
-theXQuery(aQuery),
-theSctx(aSctx)
+InvokeItemSequence::InvokeItemSequence(const XQuery_t& query, StaticContext* sctx)
+ :
+ theXQuery(query),
+ theSctx(sctx)
{
}
+
InvokeItemSequence::~InvokeItemSequence()
{
- delete theXQuery;
}
+
Iterator_t InvokeItemSequence::getIterator()
{
- return theIterator;
+ return theXQuery->iterator();
}
} // namespace zorba
=== renamed file 'src/api/invoke_item_sequence.h' => 'src/api/item_seq_invoke.h'
--- src/api/invoke_item_sequence.h 2013-02-07 17:24:36 +
+++ src/api/item_seq_invoke.h 2013-08-01 11:25:40 +
@@ -14,47 +14,48 @@
* limitations under the License.
*/
#pragma once
-#ifndef ZORBA_ITERATOR_ITEM_SEQUENCE_API_H
-#define ZORBA_ITERATOR_ITEM_SEQUENCE_API_H
+#ifndef ZORBA_API_ITEM_SEQUENCE_INVOKE
+#define ZORBA_API_ITEM_SEQUENCE_INVOKE
#include
#include
namespace zorba {
- class XQueryImpl;
-
- /** \brief A sequence backed by an iterator and it's corresponding query.
- *
- * See ItemSequence
- */
- class ZORBA_DLL_PUBLIC InvokeItemSequence : public ItemSequence
- {
-public:
- /**
- * Construct a sequence using an Iterator and its XQuery
- */
- InvokeItemSequence(
- XQueryImpl* aQuery,
- Iterator_t aIter,
- StaticContext* aSctx);
-
- /** \brief Destructor
- */
- virtual ~InvokeItemSequence();
-
- /** \brief get the Iterator over the items
- * @return an iterator over the items
- */
- virtual Iterator_t getIterator();
-
-protected:
- Iterator_t theIterator;
- XQueryImpl* theXQuery; // have ownership and destroy in destructor
- // used to make su
[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/178030 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 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/178030 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/178030 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 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 result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/179/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 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/178030 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 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 result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/178/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 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/178030 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030 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/178030 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:
added/clened-up comments
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030
added/clened-up comments
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178030
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/document_manager.h'
--- include/zorba/document_manager.h 2013-02-07 17:24:36 +
+++ include/zorba/document_manager.h 2013-08-01 09:54:32 +
@@ -21,30 +21,62 @@
namespace zorba {
- /** \brief
- *
- */
- class ZORBA_DLL_PUBLIC DocumentManager
- {
- public:
-virtual void
-put(const String& aURI, const Item& aDoc) = 0;
-
-virtual void
-remove(const String& aURI) = 0;
-
-virtual Item
-document(const String& aURI) const = 0;
-
-virtual ItemSequence_t
-availableDocuments() const = 0;
-
-virtual bool
-isAvailableDocument(const String& aURI) const = 0;
-
-virtual ~DocumentManager() {}
-
- }; /* class DocumentManager */
+/**
+ * \brief There is a single instance of DocumentManager, which provides methods
+ * for adding, removing, or accessing XML documents in the Zorba store. This single
+ * instance is accessible via the XmlDataManger::getDocumentManager() method.
+ */
+class ZORBA_DLL_PUBLIC DocumentManager
+{
+public:
+ virtual ~DocumentManager() {}
+
+ /**
+ * Add a document to the store, associating it with the given URI.
+ *
+ * This method adds the document to the "available documents" component of
+ * the dynamic context. This means that the document will remain in the
+ * store and be accessible to queries via the associated URI (e.g., by using
+ * the fn:doc() function) until it is explicitly removed via the
+ * DocumentManager::remove() method.
+ */
+ virtual void
+ put(const String& aURI, const Item& aDoc) = 0;
+
+ /**
+ * Remove the document with the given URI from the store.
+ *
+ * This method removes the document from the "available documents" component
+ * of the dynamic context. This means that the document will no longer be
+ * accessible to queries via the associated URI. However, the document is not
+ * necessarily destroyed by this method. It will be destroyed if/when no more
+ * references to it exist.
+ */
+ virtual void
+ remove(const String& aURI) = 0;
+
+ /**
+ * Return a reference to the root node of the document with the given URI.
+ */
+ virtual Item
+ document(const String& aURI) const = 0;
+
+ /**
+ * Returns an iterator over the root nodes of all the available documents
+ * (i.e., all the documents that have been added to the store via the
+ * DocumentManager::put() method).
+ */
+ virtual Iterator_t
+ availableDocuments() const = 0;
+
+ /**
+ * Check if a document with a given URI is among the available documents
+ * (i.e., the documents that have been added to the store via the
+ * DocumentManager::put() method).
+ */
+ virtual bool
+ isAvailableDocument(const String& aURI) const = 0;
+};
} /* namespace zorba */
#endif
=== modified file 'include/zorba/empty_sequence.h'
--- include/zorba/empty_sequence.h 2013-02-07 17:24:36 +
+++ include/zorba/empty_sequence.h 2013-08-01 09:54:32 +
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef ZORBA_EMPTY_SEQUENCE_API_H
-#define ZORBA_EMPTY_SEQUENCE_API_H
+#ifndef ZORBA_EMPTY_ITEM_SEQUENCE_API_H
+#define ZORBA_EMPTY_ITEM_SEQUENCE_API_H
#include
#include
@@ -23,62 +23,47 @@
namespace zorba {
- /** \brief This class is an implementation of the ItemSequence.
- * Objects of this class return, on the first next call,
- * an empty sequence.
+/**
+ * \brief This class is an implementation of the ItemSequence.
+ *Objects of this class represent the empty sequence.
+ *
+ * See ItemSequence
+ */
+class ZORBA_DLL_PUBLIC EmptySequence : public ItemSequence
+{
+ /**
+ * \brief Implements an iterator over the empty sequence.
+ * Assuming that the iterator is in the open state, its next() method will
+ * always return false.
*
- * See ItemSequence
+ * See Iterator.
*/
- class ZORBA_DLL_PUBLIC EmptySequence : public ItemSequence
+ class InternalIterator : public Iterator
{
-class InternalIterator : public Iterator
-{
-private:
- ItemSequence*theItemSequence;
- bool is_open;
-public:
- InternalIterator(ItemSequence *item_sequence);
-
- /** \brief Start iterating.
- *
- * This function needs to be called before calling next().
- *
- */
- virtual void open();
- /** \brief Get the next Item of the sequence.
- *
- * This function returns false with no item.
- * @param aItem not used
- * @return
[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/178016 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 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/178016 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/178016 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 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 result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/176/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 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/178016 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 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 result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 Stage "TestZorbaUbuntu" failed. 3 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/145/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 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/178016 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 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/178016 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: Fixed an error message Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 Fixed an error message -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178016 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2013-07-29 23:55:03 + +++ src/diagnostics/diagnostic_en.xml 2013-08-01 08:33:33 + @@ -2540,8 +2540,8 @@ "$1": document already exists in store - - "$1": item to load is not a node + + "$1": item to add to the store is not an XML document node -- 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/178011 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178011 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/178011 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/178011 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178011 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/178011 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:
added a DynamicContextImpl::setVariable() function + cosmetic
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178011
added a DynamicContextImpl::setVariable() function + cosmetic
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178011
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h 2013-06-11 23:38:49 +
+++ include/zorba/dynamic_context.h 2013-08-01 08:00:47 +
@@ -68,6 +68,25 @@
const String& aQName,
const Item& aItem) = 0;
+ /**
+ * \brief Defines the external variable identified by an expanded QName and
+ * assigns it the value of aItem.
+ *
+ * The named external variable may be located in the main query or in any
+ * modules imported directly or indirectly by the query.
+ *
+ * @param aNamespace the namespace URI of the variable's expanded QName
+ * @param aLocalname the local name of the variable's expanded QName
+ * @param aItem the Item that is used as value for the variable.
+ * @return true if the variable has been set successfully, false otherwise.
+ * @throw ZorbaException if an error occured (e.g. the given Item is not valid).
+ */
+ virtual bool
+ setVariable(
+ const String& inNamespace,
+ const String& inLocalname,
+ const Item& inValue) = 0;
+
/**
* \brief Defines the external variable identified by aQName and assigns it
* the sequence that is returned by evaluating aIterator.
=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp 2013-06-18 23:53:59 +
+++ src/api/dynamiccontextimpl.cpp 2013-08-01 08:00:47 +
@@ -34,6 +34,8 @@
#include "api/xqueryimpl.h"
#include "api/resultiteratorimpl.h"
#include "api/storeiteratorimpl.h"
+//#include "api/item_iter_query_result.h"
+//#include "api/item_iter_store.h"
#include "api/dynamiccontextimpl.h"
#include "compiler/parser/query_loc.h"
@@ -231,6 +233,55 @@
/
bool DynamicContextImpl::setVariable(
+const String& inVarName,
+const Iterator_t& inValue)
+{
+ ZORBA_DCTX_TRY
+ {
+checkNoIterators();
+
+if (!inValue.get())
+{
+ throw ZORBA_EXCEPTION(zerr::ZAPI0014_INVALID_ARGUMENT,
+ ERROR_PARAMS("null", ZED( BadIterator)));
+}
+
+const zstring& varName = Unmarshaller::getInternalString(inVarName);
+store::Iterator_t value = Unmarshaller::getInternalIterator(inValue.get());
+
+VarInfo* var = NULL;
+
+try
+{
+ var = get_var_info(varName);
+}
+catch (ZorbaException const& e)
+{
+ // Normally, we should be throwing an exception if the variable has not
+ // been declared inside the xquery program, but this cases many failures
+ // with the w3c XQTS.
+ if (e.diagnostic() == err::XPST0008)
+ {
+return false;
+ }
+ throw;
+}
+
+ulong varId = var->getId();
+
+theCtx->add_variable(varId, value);
+
+return true;
+ }
+ ZORBA_DCTX_CATCH
+ return false;
+}
+
+
+///**
+
+/
+bool DynamicContextImpl::setVariable(
const String& inNamespace,
const String& inLocalname,
const Iterator_t& inValue)
@@ -247,6 +298,7 @@
const zstring& nameSpace = Unmarshaller::getInternalString(inNamespace);
const zstring& localName = Unmarshaller::getInternalString(inLocalname);
+
store::Iterator_t value = Unmarshaller::getInternalIterator(inValue.get());
VarInfo* var = NULL;
@@ -282,6 +334,53 @@
/
bool DynamicContextImpl::setVariable(
+const String& inNamespace,
+const String& inLocalname,
+const Item& inValue)
+{
+ ZORBA_DCTX_TRY
+ {
+checkNoIterators();
+
+const zstring& nameSpace = Unmarshaller::getInternalString(inNamespace);
+const zstring& localName = Unmarshaller::getInternalString(inLocalname);
+
+store::Item_t value(Unmarshaller::getInternalItem(inValue));
+checkItem(value);
+
+VarInfo* var = NULL;
+
+try
+{
+ var = get_var_info(nameSpace, localName);
+}
+catch (ZorbaException const& e)
+{
+ // Normally, we should be throwing an exception if the variable has not
+ // been declared inside the xquery program, but this causes many failures
+ // with the w3c XQTS.
+ if (e.diagnostic() == err::XPST0008)
+ {
+return false;
+ }
+ throw;
+}
+
+ulong varId = var->getId();
+
+theCtx->add_variable(varId, value);
+
+return true;
+ }
+ ZORBA
