Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba
> I just checked: ZorbaException already has a global > operator<<(ostream&,ZorbaException const&) function defined for it. > > So why do you need to do anything at all? Hi Paul, sorry for not following up for a long time. We just need it to get the errors in xml format. I guess this is not supported in operator<<(ostream&,ZorbaException const&). I will investigate in the stream manipulators. Hopefully, I understand how it works! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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/clang-friend into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/clang-friend into lp:zorba has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/clang-friend/+merge/101518 -- https://code.launchpad.net/~zorba-coders/zorba/clang-friend/+merge/101518 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-error_printer_in_api into lp:zorba
Cool, now I can fix what someone else did wrong :-(. Anyway, Paul, can you help me on one thing please? Can you tell me how I can use this ErrorPrinter for warnings too? > It's a stupid API. There's no reason to have a class with a single static > member function. If you're going to make it public, it needs to be better. > Two things come to mind: > > 1. (Trivial) Simply make it a global function -- no need for a class. > > 2. (Less trivial) Create a (real) ErrorPrinter class that holds the > configuration parameters; then using operator<<, you can write an > XQueryException to it. > > 3. Regardless, the indentation parameter should be an unsigned int (not a > bool): it will specify a multiplier for the amount of indentation (where 0 = > none). > > BTW: It should take a ZorbaException, not an XQueryException. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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-error_printer_in_api into lp:zorba
It would be good to use this error printer for the warning reporter too. But I didn't figure out how that should work yet? Can you guys help? -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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-error_printer_in_api into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba has been updated. Commit Message changed to: Moving the error printer from zorbacmd into the api. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405 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-error_printer_in_api into lp:zorba
David Graf has proposed merging
lp:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba.
Commit message:
Moving the error printer from zorbacmd into the api.
Requested reviews:
Matthias Brantner (matthias-brantner)
William Candillon (wcandillon)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405
Moving the error printer from zorbacmd into the api.
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-11-07 11:48:14 +
+++ ChangeLog 2012-11-15 07:23:22 +
@@ -118,6 +118,7 @@
http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
* Added support for fragments to fn:path
* Positional pagination support for collections
+ * Pagination by reference support for collections
* http://www.zorba-xquery.com/modules/archive module for creating,
reading, and updating various (compressed) archives (e.g. zip, tar.gz,
or tar.bz2)
=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt 2012-11-08 21:57:10 +
+++ bin/CMakeLists.txt 2012-11-15 07:23:22 +
@@ -44,7 +44,6 @@
SET(SRCS
zorbacmd.cpp
zorbacmdproperties.cpp
- error_printer.cpp
util.cpp
path_util.cpp
)
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2012-11-06 10:11:37 +
+++ bin/zorbacmd.cpp 2012-11-15 07:23:22 +
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
@@ -51,7 +52,6 @@
#include
#endif
-#include "error_printer.h"
#include "util.h"
#include "path_util.h"
=== renamed file 'bin/error_printer.h' => 'include/zorba/util/error_printer.h'
--- bin/error_printer.h 2012-09-19 21:16:15 +
+++ include/zorba/util/error_printer.h 2012-11-15 07:23:22 +
@@ -22,14 +22,22 @@
class XQueryException;
-class ErrorPrinter {
+class ZORBA_DLL_PUBLIC ErrorPrinter {
public:
+/**
+ * Generates an error message out of an XQuery exception.
+ *
+ * @param aException The exception.
+ * @param aOut Stream to which the error message is written to.
+ * @param aAsXml Error message in XML format?
+ * @param aIndet Error message indented?
+ */
static std::ostream&
print(
- const XQueryException& lException,
- std::ostream& lOut,
+ const XQueryException& aException,
+ std::ostream& aOut,
bool aAsXml,
bool aIndent);
=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt 2012-10-08 12:09:36 +
+++ src/api/CMakeLists.txt 2012-11-15 07:23:22 +
@@ -60,6 +60,7 @@
streambuf.cpp
transcode_streambuf.cpp
uuid.cpp
+error_printer.cpp
)
IF (NOT ZORBA_NO_FULL_TEXT)
=== renamed file 'bin/error_printer.cpp' => 'src/api/error_printer.cpp'
--- bin/error_printer.cpp 2012-09-19 21:16:15 +
+++ src/api/error_printer.cpp 2012-11-15 07:23:22 +
@@ -23,7 +23,7 @@
#include
#include "zorba/util/uri.h"
-#include "error_printer.h"
+#include
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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/image-module-dont-pass-svg-as-binary into lp:zorba/image-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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/image-module-head into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/image-module-head into lp:zorba has been updated. Commit Message changed to: take image module HEAD (not 2.7 tag) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/image-module-head/+merge/133626 -- https://code.launchpad.net/~zorba-coders/zorba/image-module-head/+merge/133626 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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
> > On Nov 8, 2012, at 6:13 AM, David Graf wrote: > > >> - getImageFromString: const String aString, should be const String& > aString, > > Done > >> - basic:convert-svg-impl should use basic:convert-svg-string > > I don't understand. Currently, convert-svg-string invokes convert-svg-impl. > How should that work the other way round? > Sorry, I meant to say basic:convert-svg should use basic:convert-svg-string done > > >> > >> - we might have to make sure the new module is used in Zorba (edit > >> ExternalModules.conf) > > Like this: https://code.launchpad.net/~zorba-coders/zorba/image-module-head? > Yes. This one should be merged first. proposed -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/image-module-head into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/image-module-head/+merge/133626 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/image-module-head into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/image-module-head into lp:zorba. Commit message: take image module HEAD (not 2.7 tag) Requested reviews: David Graf (davidagraf) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/image-module-head/+merge/133626 take image module HEAD (not 2.7 tag) -- https://code.launchpad.net/~zorba-coders/zorba/image-module-head/+merge/133626 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2012-10-25 00:07:03 + +++ modules/ExternalModules.conf 2012-11-09 08:40:28 + @@ -35,7 +35,7 @@ graphvizbzr lp:zorba/graphviz-module zorba-2.7 htmlbzr lp:zorba/html-module zorba-2.7 http-client bzr lp:zorba/http-client-module zorba-2.7 -image bzr lp:zorba/image-modulezorba-2.7 +image bzr lp:zorba/image-module languages bzr lp:zorba/languages-modulezorba-2.7 oauth bzr lp:zorba/oauth-modulezorba-2.7 process bzr lp:zorba/process-module zorba-2.7 -- 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/bug-1075106 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1075106/+merge/133612 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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
> - getImageFromString: const String aString, should be const String& aString, Done > - basic:convert-svg-impl should use basic:convert-svg-string I don't understand. Currently, convert-svg-string invokes convert-svg-impl. How should that work the other way round? > > - we might have to make sure the new module is used in Zorba (edit > ExternalModules.conf) Like this: https://code.launchpad.net/~zorba-coders/zorba/image-module-head? -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/schema-tools-module-module-bug-989490 into lp:zorba/schema-tools-module
Chris, the other merge proposal went through (data-formatting-module). Can you approve this one too? -- https://code.launchpad.net/~davidagraf/zorba/schema-tools-module-module-bug-989490/+merge/110271 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
Matthias, is it ok for you now? -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
The proposal to merge lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Hey Chris This merge proposal got lost. Do you know the status of this? I lost the overview. But I guess that FIND_PACKAGE(JNI) in all the java modules should be replaced with ZORBA_FIND_JNI(). Do you agree? -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 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/module-depends into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/module-depends into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/module-depends into lp:zorba
the failing test works on my machine. Seems to be a timeout. I try again .. -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/module-depends into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/module-depends into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/module-depends into lp:zorba
chris, is it ok like this? -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
Thanks Chris! -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
Sorry for asking such a stupid question, but how can I increase the version? If
I exchange 1.0 with 1.1., it doesn't work anymore:
:64,9:
Zorba error [zerr:ZXQP0008]:
"{http://www.zorba-xquery.com/modules/image/basic}width#1": function
implementation not found; raised at
/Users/dagraf/work/28msec/zorba/sandbox/src/compiler/translator/translator.cpp:3615
--
https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829
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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/image-module-dont-pass-svg-as-binary into lp:zorba/image-module has been updated. Commit Message changed to: Passing the svg to the convert-svg function as a node or a string, instead of a binary. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
David Graf has proposed merging
lp:~zorba-coders/zorba/image-module-dont-pass-svg-as-binary into
lp:zorba/image-module.
Commit message:
Passing the svg to the convert-svg function as a node or a string, instead of a
binary.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829
Passing the svg to the convert-svg function as a node or a string, instead of a
binary.
--
https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.
=== modified file 'src/com/zorba-xquery/www/modules/image/basic.xq'
--- src/com/zorba-xquery/www/modules/image/basic.xq 2011-08-04 04:09:00 +
+++ src/com/zorba-xquery/www/modules/image/basic.xq 2012-10-29 07:59:20 +
@@ -50,6 +50,7 @@
declare namespace err = "http://www.w3.org/2005/xqt-errors";;
declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";;
declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace svg = "http://www.w3.org/2000/svg";;
declare option ver:module-version "1.0";
(:~
@@ -165,9 +166,40 @@
: @error ierr:IM001 the passed SVG is invalid.
: @example test/Queries/image/basic_svg.xq
:)
-declare function basic:convert-svg($svg as xs:base64Binary, $format as xs:string) as xs:base64Binary {
- basic:convert-svg-impl($svg, image:imageFormat($format))
-};
-
-declare %private function basic:convert-svg-impl($svg as xs:base64Binary, $format as xs:string) as xs:base64Binary external;
+declare function basic:convert-svg(
+ $svg as element(svg:svg),
+ $format as xs:string)
+ as xs:base64Binary {
+
+ let $ser-params :=
+ http://www.w3.org/2010/xslt-xquery-serialization";>
+
+
+ let $string as xs:string := fn:serialize($svg, $ser-params)
+ return
+ basic:convert-svg-impl($string, image:imageFormat($format))
+};
+
+(:~
+ : Converts an SVG image to a supported image format.
+ :
+ : @param $svg the image to convert as string
+ : @param $format target format
+ : @return the resulting image
+ : @error ierr:IM001 the passed SVG is invalid.
+ : @example test/Queries/image/basic_svg.xq
+ :)
+declare function basic:convert-svg-string(
+ $svg as xs:string,
+ $format as xs:string)
+ as xs:base64Binary {
+
+ basic:convert-svg-impl($svg, image:imageFormat($format))
+};
+
+declare %private function basic:convert-svg-impl(
+$svg as xs:string,
+$format as xs:string)
+ as xs:base64Binary external;
=== modified file 'src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp'
--- src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp 2011-08-04 04:09:00 +
+++ src/com/zorba-xquery/www/modules/image/basic.xq.src/basic.cpp 2012-10-29 07:59:20 +
@@ -13,15 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
#include "basic.h"
-#include
+
+#include
#include
#include
+
+#include
#include
-#include
#include
#include
+
#include "basic_module.h"
#include "draw_in_c.h"
@@ -105,11 +107,13 @@
ItemSequence_t
ConvertSVGFunction::evaluate(
const ExternalFunction::Arguments_t& aArgs,
- const StaticContext* aSctxCtx,
- const DynamicContext* aDynCtx) const
+ const StaticContext* aSctxCtx,
+ const DynamicContext*aDynCtx) const
{
Magick::Image lImage;
- ImageFunction::getOneImageArg(aDynCtx, aArgs, 0, lImage);
+ String lSVG = ImageFunction::getOneStringArg(aArgs, 0);
+ ImageFunction::getImageFromString(aDynCtx, lSVG, lImage, false);
+
if (lImage.magick().compare("SVG") != 0) {
ImageFunction::throwErrorWithQName(aDynCtx, "IM002", "The passed xs:base64Binary is not an image of type SVG");
}
=== modified file 'src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp'
--- src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp 2012-09-27 00:20:46 +
+++ src/com/zorba-xquery/www/modules/image/image_commons/image_function.cpp 2012-10-29 07:59:20 +
@@ -316,9 +316,21 @@
}
void
-ImageFunction::getImageFromString(const DynamicContext* aDynamicContext, const String aString, Magick::Image& aImage) {
-
- String lDecodedContent = zorba::encoding::Base64::decode(aString);
+ImageFunction::getImageFromString(const DynamicContext* aDynamicContext,
+ const String aString,
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/image-module-dont-pass-svg-as-binary into lp:zorba/image-module
I know, this change is not backwards compatible. But passing the svg as binary just doesn't make sense to me! Especially because the first thing the module did was transforming the binary back to string. -- https://code.launchpad.net/~zorba-coders/zorba/image-module-dont-pass-svg-as-binary/+merge/131829 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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/test-bug-1070551 into lp:zorba/security-module
The proposal to merge lp:~zorba-coders/zorba/test-bug-1070551 into lp:zorba/security-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/test-bug-1070551/+merge/131101 -- https://code.launchpad.net/~zorba-coders/zorba/test-bug-1070551/+merge/131101 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/test-bug-1070551 into lp:zorba/security-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/test-bug-1070551/+merge/131101 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/module-depends into lp:zorba
We need the feature to make a module dependent on some header file generation done with zorba. Is the renaming like this ok? -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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-1070551 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1070551 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1070551/+merge/131099 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1070551/+merge/131099 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/bug-1070551 into lp:zorba
Review: Approve I tested it in sausalito too. Works! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1070551/+merge/131099 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/module-depends into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/module-depends into lp:zorba
Till, this changed is needed for 28msec. Our mongodb module is dependent on one of our targets. -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/module-depends into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/module-depends into lp:zorba has been updated. Commit Message changed to: Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets the declared module depends on. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 -- https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784 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/module-depends into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/module-depends into
lp:zorba.
Commit message:
Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets
the declared module depends on.
Requested reviews:
David Graf (davidagraf)
Till Westmann (tillw)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets
the declared module depends on.
--
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-10-08 12:09:36 +
+++ cmake_modules/ZorbaModule.cmake 2012-10-22 11:42:20 +
@@ -118,6 +118,7 @@
# information; see below
# TEST_ONLY - (optional) Module is for testcases only and should not
# be installed
+# DEPENDS - (optional) List of targets the module depends on
#
# CONFIG_FILES - any files specific here will be copied to
# CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
@@ -136,7 +137,7 @@
# file enough to deduce the URI and version?
MACRO (DECLARE_ZORBA_MODULE)
# Parse and validate arguments
- PARSE_ARGUMENTS(MODULE "LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES"
+ PARSE_ARGUMENTS(MODULE "LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES;DEPENDS"
"URI;FILE;VERSION" "TEST_ONLY" ${ARGN})
IF (NOT MODULE_FILE)
MESSAGE (FATAL_ERROR "'FILE' argument is required for ZORBA_DECLARE_MODULE()")
@@ -268,6 +269,9 @@
# the module *URI*'s final component.
SET(module_lib_target "modlib${num_zorba_modules}_${module_name}")
ADD_LIBRARY(${module_lib_target} SHARED ${SRC_FILES})
+IF (MODULE_DEPENDS)
+ ADD_DEPENDENCIES(${module_lib_target} ${MODULE_DEPENDS})
+ENDIF()
GET_FILENAME_COMPONENT(module_filewe "${module_filename}" NAME_WE)
IF (MODULE_VERSION)
# If there's a version, insert it into the module library name
--
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/coll-iter-state-init into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Commit Message changed to: Init ZorbaCollectionIteratorState::theIteratorOpened properly. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/coll-iter-state-init
into lp:zorba.
Commit message:
Init ZorbaCollectionIteratorState::theIteratorOpened properly.
Requested reviews:
David Graf (davidagraf)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055
Init ZorbaCollectionIteratorState::theIteratorOpened properly.
I made this fix because it caused a failure in 28msec's persistent store.
Unfortunately, I am not able to reproduce a similar problem in Zorba's
simplestore. Although I moved the failing code into a test (see diff).
--
https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/collections/collections_impl.cpp'
--- src/runtime/collections/collections_impl.cpp 2012-10-15 13:35:59 +
+++ src/runtime/collections/collections_impl.cpp 2012-10-17 09:16:48 +
@@ -346,6 +346,7 @@
void ZorbaCollectionIteratorState::init(PlanState& planState)
{
PlanIteratorState::init(planState);
+ theIteratorOpened = false;
theIterator = NULL;
}
=== modified file 'test/rbkt/Queries/zorba/collections/paging_1.xq'
--- test/rbkt/Queries/zorba/collections/paging_1.xq 2012-09-19 21:16:15 +
+++ test/rbkt/Queries/zorba/collections/paging_1.xq 2012-10-17 09:16:48 +
@@ -4,6 +4,7 @@
import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";;
declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace zerr = "http://www.zorba-xquery.com/errors";;
declare function local:order($items)
{
@@ -18,6 +19,18 @@
dml:insert-nodes(xs:QName("ns:test2"), );
dml:insert-nodes(xs:QName("ns:test2"), );
dml:insert-nodes(xs:QName("ns:test2"), (, , ));
+
+ try {
+ dml:collection(xs:QName("ns:test2"),
+ xs:anyURI("urn:uuid:----"),
+ 0);
+ fn:error(); (: has to fail :)
+ }
+ catch zerr:ZSTR0066
+ {
+(: all ok :)
+ }
+
(
local:order(dml:collection(xs:QName("ns:test2"), 3)), ,
local:order(dml:collection(xs:QName("ns:test2"), -1)), ,
--
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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Commit Message changed to: Init ZorbaCollectionIteratorState::theIteratorOpened properly. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 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/coll-iter-state-init into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba. Commit message: Init ZorbaCollectionIteratorState::theIteratorOpened properly. Requested reviews: David Graf (davidagraf) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 Init ZorbaCollectionIteratorState::theIteratorOpened properly. I made this fix because it caused a failure in 28msec's persistent store. Unfortunately, I am not able to reproduce a similar problem in Zorba's simplestore. Although I moved the failing code into a test (see diff). -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 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/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
> > > - The options schema uses a different modeling approach than all the > others. > > > It's not that all the others are consistent but this one seems to be > > > introducing yet another way to model options, i.e. all as attributes of > one > > > element. Maybe we should make it consistent with at least one of the other > > > option schemas. > > I took this one because it's very compact. So, how should it be done. With > > Jsoniq :-)? Or XML module style: > > > > > > > > > I would do it the way the schema-tools-options or archive schemas do it (e.g. > true). Alternatively, it could be done similar to > the > serialization options (e.g. ). done -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/xqdoc-extensions into lp:zorba
> - The options schema uses a different modeling approach than all the others. > It's not that all the others are consistent but this one seems to be > introducing yet another way to model options, i.e. all as attributes of one > element. Maybe we should make it consistent with at least one of the other > option schemas. I took this one because it's very compact. So, how should it be done. With Jsoniq :-)? Or XML module style: > > - The issue I raised about backwards compatibility was my fault. The way it's > done, is perfectly fine. > > - Wasn't the sources element required for Alexander? The sources are still there. But not in the sources element anymore. -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/createUntypedAtomic into lp:zorba
> ChangeLog done -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Description changed to: added createUntypedAtomic to public API For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/createUntypedAtomic into lp:zorba has been updated. Commit Message changed to: added createUntypedAtomic to public API For more details, see: https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 -- https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283 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/createUntypedAtomic into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/createUntypedAtomic into
lp:zorba.
Commit message:
added createUntypedAtomic to public API
Requested reviews:
David Graf (davidagraf)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283
added createUntypedAtomic to public API
--
https://code.launchpad.net/~zorba-coders/zorba/createUntypedAtomic/+merge/126283
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-09-17 00:36:37 +
+++ include/zorba/item_factory.h 2012-09-25 16:08:22 +
@@ -713,6 +713,13 @@
Item parent,
String content) = 0;
+ /** \brief Creates a UntypedAtomic Item
+ *
+ * @param value String representation of the UntypedAtomic Item.
+ * @return The UntypedAtomic Item
+ */
+ virtual Item createUntypedAtomic(const String& value) = 0;
+
#ifdef ZORBA_WITH_JSON
/**
=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp 2012-09-17 00:36:37 +
+++ src/api/itemfactoryimpl.cpp 2012-09-25 16:08:22 +
@@ -880,6 +880,14 @@
return &*lItem;
}
+zorba::Item ItemFactoryImpl::createUntypedAtomic(const String& value)
+{
+ store::Item_t lItem;
+ zstring &lValue = Unmarshaller::getInternalString(value);
+ theItemFactory->createUntypedAtomic(lItem, lValue);
+ return &*lItem;
+}
+
#ifdef ZORBA_WITH_JSON
zorba::Item ItemFactoryImpl::createJSONNull()
=== modified file 'src/api/itemfactoryimpl.h'
--- src/api/itemfactoryimpl.h 2012-09-17 00:36:37 +
+++ src/api/itemfactoryimpl.h 2012-09-25 16:08:22 +
@@ -263,6 +263,9 @@
Item parent,
String content);
+ virtual Item
+ createUntypedAtomic(const String& value);
+
#ifdef ZORBA_WITH_JSON
virtual Item
createJSONNull();
=== modified file 'test/api/itemfactory.cpp'
--- test/api/itemfactory.cpp 2012-09-17 00:36:37 +
+++ test/api/itemfactory.cpp 2012-09-25 16:08:22 +
@@ -560,6 +560,13 @@
UNIT_ASSERT ( !lItem.getAtomizationValue().isNull() );
CHECK_NOT_IMPLEMENTED(lItem, getBooleanValue() );
+/** String */
+lItem = lFactory->createUntypedAtomic("abc");
+UNIT_ASSERT ( checkType(lItem.getType(), "untypedAtomic") );
+UNIT_ASSERT ( lItem.isAtomic() );
+UNIT_ASSERT ( lItem.getStringValue() == "abc" );
+UNIT_ASSERT ( !lItem.getAtomizationValue().isNull() );
+
} catch (ZorbaException &e) {
std::cerr << e << std::endl;
return 1;
--
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/xqdoc-extensions into lp:zorba
> - adjust date in the Copyright headers
done. Although it is a real pain. I even change the date in the automatic code
generation to 2012 (from 2008!). Thus, there are quite a lot of s/2008/2012
changes. Would be nice to implement a script to generate this thing
automatically. Year to put could be figured out by executing bzr log --limit 1.
>
> - defaults are not backwards compatible (e.g. functions are not included by
> default )
I do not understand. Can you give me an example?
>
> - fetch:content($module-uri) => fetch:content($module-uri, "MODULE")
done
>
> - we should mark the xqdoc:xqdoc function as deprecated (@deprecated tag)
done
>
> - we are getting more an more out of sync with the original xqdoc schema. Is
> there a way to extend the schema?
I started to create a zorba-xqdoc schema. But I gave up after some point. It
became too confused. For collections and indexes, it would make sense to create
an additional schema (except that we would have to deals which two different
namespaces). But they are many little changes which are not in the original
xqdoc. Mostly the annotation and custom element. Zorba should try to push them
into the original xqdoc. Afterwards, a separate schema for the collections and
indexes could be created.
>
> - in end_visit(const FunctionDecl& and end_visit(const GlobalVarDecl
>it would be nice if you could do the following check at the beginning and
> don't change the indentation of the remaining body of the function
> if (!(theOptions & xqdoc_component_functions/variables))
> {
> return
> }
>
> This would reduce the size of the diff significantly
done
>
> - a collection is output as
>
> foo:bar
>
>
> But foo:bar is the QName not the URI. We should either only include the
> localname or separate the two components in separate elements (although the ns
> will always be the module's namespace).
Implemented variant 1. But I am not so happy. Because variables and functions
should be cleaned up too. But I don't have the patience for this. Because it
will destroy the zorba module documentation generation. This needs to be fixed
by someone else.
>
> - The following index declarations leads to an empty sources element.
>
> declare index foo:index
> on nodes db:collection(xs:QName("foo:bar"))
> by xs:string(./@id) as xs:string;
>
> =>
> foo:index
>
>
>
> Also, there is the same problem with the uri element than for collections.
Should be fixed now.
Additionally, I fixed the following issues:
- xqdoc comment generation for indices and collections
- test for indexes and collections
- type into type element (and not custom element)
- removed sources element
--
https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662
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/xqdoc-extensions into lp:zorba
Documentation improvements are welcomed :-) -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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/xqdoc-extensions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba has been updated. Commit Message changed to: - xqdoc generation for collection declarations - xqdoc generation for index declarations (inclusive sources) - possibility to disable xqdoc generation for certain components For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 -- https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662 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:~davidagraf/zorba/paging_index_probe into lp:zorba
The proposal to merge lp:~davidagraf/zorba/paging_index_probe into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 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:~davidagraf/zorba/paging_index_probe into lp:zorba
The proposal to merge lp:~davidagraf/zorba/paging_index_probe into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 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:~davidagraf/zorba/paging_index_probe into lp:zorba
> > > - the probe-index-point-value-skip and probe-index-range-value-skip
> > functions
> > > in dml.xq don't declare the $skip parameters (but their documentation
> does)
> > Fixed.
> > >
> > > - idml:probe-index-range-value-skip(xs:QName("data:idx-age-range-val"), 2,
> > 3,
> > > true(), true(), true(), true())
> > > reports
> > > '"data:idx-age-range-val": invalid number of arguments to index
> operation;
> > > given 5 expected multiple of 6;'
> > > but I'm counting 7 parameters
> > Fixed (was not my fault :-) ). Unfortunately, when trying to write a test
> for
> > this, I found a bug: https://bugs.launchpad.net/zorba/+bug/1051897 Can you
> > please double check if it is really a bug?
> I commented on the bug.
>
> > > - It would be great if the iterator plan could mention if the iterator
> does
> > > skipping and/or counting. For example, ./test/apitest -i paging.xq
> contains
> > > the following snippet
> > >
> > >
> > >http://www.test.com/,data,idx-age-
> > range-
> > > val)" id="0x1a146a0"/>
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > >
> > > for
> > >
> > > count(idml:probe-index-range-value-skip(xs:QName("data:idx-age-range-
> val"),
> > > 7, 2, 3, true(), true(), true(), true()))
> > Is it ok to create a bug entry for this? Because this has to be done in the
> > collection iterator too. It can be assigned to me. But I would like to get
> > those merge proposals thru.
> Does it take long to do this. It would be really nice and I'm afraid it will
> not
> get done if we create a bug for it. ;-)
Ok, it was not that hard. Do you like it? Nevertheless, it also has to be done
for collections.
>
> - Should a negative skip value be an error? If not, some documentation is
> missing here.
No. Negative skip means no skip.
>
> - ChangeLog entry is missing.
done
--
https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621
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:~davidagraf/zorba/paging_index_probe into lp:zorba
> - the probe-index-point-value-skip and probe-index-range-value-skip functions
> in dml.xq don't declare the $skip parameters (but their documentation does)
Fixed.
>
> - idml:probe-index-range-value-skip(xs:QName("data:idx-age-range-val"), 2, 3,
> true(), true(), true(), true())
> reports
> '"data:idx-age-range-val": invalid number of arguments to index operation;
> given 5 expected multiple of 6;'
> but I'm counting 7 parameters
Fixed (was not my fault :-) ). Unfortunately, when trying to write a test for
this, I found a bug: https://bugs.launchpad.net/zorba/+bug/1051897 Can you
please double check if it is really a bug?
>
> - the branch seems to undo some changes in the trunk (see diagnostic_en.xml)
>
> - $1: does not reference a node in collection $2.
> + Node reference $1 doesn't reference a node in collection
> $2.
>
Fixed.
> - It would be great if the iterator plan could mention if the iterator does
> skipping and/or counting. For example, ./test/apitest -i paging.xq contains
> the following snippet
>
>
>http://www.test.com/,data,idx-age-range-
> val)" id="0x1a146a0"/>
>
>
>
>
>
>
>
>
>
> for
>
> count(idml:probe-index-range-value-skip(xs:QName("data:idx-age-range-val"),
> 7, 2, 3, true(), true(), true(), true()))
Is it ok to create a bug entry for this? Because this has to be done in the
collection iterator too. It can be assigned to me. But I would like to get
those merge proposals thru.
--
https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621
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:~davidagraf/zorba/paging_index_probe into lp:zorba
> Problems:
> - Based on the paging.xqlib module (in the tests), the following query should
> return the empty sequence:
>
> idml:probe-index-range-value-skip(xs:QName("data:idx-age-range-val"),
> 10, 2, 3, true(), true(), true(), true())
Fixed
>
> But it returns all the items with age 3. This seems wrong.
>
> - idml:probe-index-range-value sorts the nodes implicitly in document order,
> i.e. they are not returned in the order of the index keys. The skipping is
> done before the sorting. This might be really confusing to the user.
> Essentially, he doesn't have a way to know which items are skipped. We have
> talked to Markos and he agreed that we remove the sorting from the range-value
> functions and only add it if the probe is used to answer queries.
Fixed by you
>
> - The module in modules/com/zorba-
> xquery/www/modules/store/static/indexes/dml.xq doesn't contain the -skip
> functions. It looks like the probe-index-point-value appears twice and is
> missing the -skip suffix. The same seems to be the case for the probe-index-
> range-value function. Also, the documentation for what is probably supposed to
> be the -skip function is very long. Maybe it can make a reference to the
> original probe function and only mention the fact that it returns the values
> for the keys.
done
>
> Minor issues:
> - I wasn't able to merge the trunk into this branch because there are tons of
> merge conflicts in translator.cpp. Also, bzr reports that a criss-cross merge
> was encountered. Probably because the collection-skipping branch was merged in
> the meantime. I don't understand why the merge proposal doesn't show any
> conflict. Without merging the trunk, I can't link because of the uuid_generate
> problem.
done
>
> - There seem to be plenty of whitespace-only changes in
> src/functions/signature.cpp? I couldn't figure out whether there are actually
> semantic changes in that file. Are they necessary (e.g. removing tabs)?
In signature.cpp are not whitespace changes only. There is an additional
constructor too. But I do not understand how I can avoid the whitespace
changes. If I do a simple change in the file with vi, I get them.
--
https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621
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:~davidagraf/zorba/paging_with_refs into lp:zorba
The proposal to merge lp:~davidagraf/zorba/paging_with_refs into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/123509 -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/123509 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:~davidagraf/zorba/paging_with_refs into lp:zorba
The proposal to merge lp:~davidagraf/zorba/paging_with_refs into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/123509 -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/123509 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:~davidagraf/zorba/paging_with_refs into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/paging_with_refs into lp:zorba. Requested reviews: Till Westmann (tillw) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/123509 Resubmit to trigger patchqueue. -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/123509 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'include/zorba/pregenerated/diagnostic_list.h' --- include/zorba/pregenerated/diagnostic_list.h 2012-08-30 13:45:43 + +++ include/zorba/pregenerated/diagnostic_list.h 2012-09-10 09:15:57 + @@ -750,6 +750,8 @@ extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0065_STRINGS_IN_POOL; +extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0066_REFERENCED_NODE_NOT_IN_COLLECTION; + extern ZORBA_DLL_PUBLIC ZorbaErrorCode XSST0001; extern ZORBA_DLL_PUBLIC ZorbaErrorCode XSST0002; === modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq' --- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-08-30 13:45:43 + +++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-09-10 09:15:57 + @@ -781,6 +781,10 @@ (:~ :) +declare variable $zerr:ZSTR0066 as xs:QName := fn:QName($zerr:NS, "zerr:ZSTR0066"); + +(:~ +:) declare variable $zerr:XSST0001 as xs:QName := fn:QName($zerr:NS, "zerr:XSST0001"); (:~ === modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq' --- modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq 2012-08-30 13:45:43 + +++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq 2012-09-10 09:15:57 + @@ -632,6 +632,35 @@ (:~ + : The collection function returns the sequence of nodes and/or json items + : that belong to the collection identified by the given name. + : The parameters $start and $skip can be used to skip over some items at + : the beginning of the collection. If both are given, both are applied: + : first $start to skip to the referenced item and then $skip to skip an + : additional number of items. + : + : @param $name The name of the collection. + : @param $start A reference to the first item to return. All items before + are skipped. + : @param $skip The number of collection items to skip. + : + : @return The sequence contained in the given collection. + : + : @error zerr:ZAPI0028 If the given URI is not a valid node + :position computed by the np:node-position function. + : @error zerr:ZDDY0003 If available collections does not provide a mapping + :for the expanded QName $name. + : @error zerr:ZSTR0066 If the passed reference $start does not reference + :a node from the collection identified by $name. + : + :) +declare function +dml:collection($name as xs:QName, + $start as xs:anyURI, + $skip as xs:integer) as item()* external; + + +(:~ : The collection-name function returns the name of the collection the given : item (node or json item) belongs to. : === modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq' --- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq 2012-08-30 13:45:43 + +++ modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq 2012-09-10 09:15:57 + @@ -884,6 +884,33 @@ (:~ + : The collection function returns the sequence of nodes and/or json items + : that belong to the collection identified by the given name. + : The parameters $start and $skip can be used to skip over some items at + : the beginning of the collection. If both are given, both are applied: + : first $start to skip to the referenced item and then $skip to skip an + : additional number of items. + : + : @param $name The name of the collection. + : @param $start The reference to the first item to return. All items before + are skipped. + : @param $skip The number of collection items to skip. + : + : @return The sequence contained in the given collection. + : + : @error zerr:ZAPI0028 If the given URI is not a valid node + :position computed by the np:node-position function. + : @error zerr:ZDDY0001 if the collection identified by $name is not declared. + : @error zerr:ZDDY0003 if the collection identified by $name is not available. + : @error zerr:ZSTR0066 if the passed reference $start does not reference + :a node from the collection identified by $name. + : + :) +declare function +cdml:collection($name as xs:QName, +$start as xs:anyURI, +$skip as xs:integer) as item()* external; +(:~ : The collection-name function returns the name of the collection the given : item (node or json item) belongs to. : === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2012-08-31 19:53:50 + +++ src/diagn
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/paging_index_probe into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/123494 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
The proposal to merge lp:~davidagraf/zorba/lastmodifiedfix into lp:zorba has been updated. Commit Message changed to: Fix bug #1045902. For more details, see: https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/123494 -- https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/123494 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/lastmodifiedfix into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/123494
--
https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/123494
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-09 07:46:57 +
+++ ChangeLog 2012-09-10 07:14:24 +
@@ -26,6 +26,7 @@
* Fixed bug #1042840 (qname pool free-list corruption)
* Fixed bug #866984 (better error message for an eval error)
* Fixed bug #932884 (HTML and XHTML serialization of empty elements)
+ * Fixed bug #1045902 (file:last-modified returns current date time)
version 2.6
=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp 2012-08-30 13:45:43 +
+++ modules/org/expath/ns/file.xq.src/file.cpp 2012-09-10 07:14:24 +
@@ -603,11 +603,19 @@
// actual last modified
try {
time_t lTime = lFile->lastModified();
-struct tm *lT = localtime(&lTime);
+// result of localtime needs to be copied.
+// Otherwise, nasty side effecs do happen
+struct tm lT(*localtime(&lTime));
int gmtOffset = LastModifiedFunction::getGmtOffset();
return ItemSequence_t(new SingletonItemSequence(
- theModule->getItemFactory()->createDateTime(1900 + lT->tm_year, lT->tm_mon, lT->tm_mday, lT->tm_hour, lT->tm_min, lT->tm_sec, gmtOffset)));
+ theModule->getItemFactory()->createDateTime(1900 + lT.tm_year,
+ lT.tm_mon,
+ lT.tm_mday,
+ lT.tm_hour,
+ lT.tm_min,
+ lT.tm_sec,
+ gmtOffset)));
} catch (ZorbaException& ze) {
std::stringstream lSs;
lSs << "An unknown error occured: " << ze.what() << "Can not retrieve the last modification timestamp of";
--
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:~davidagraf/zorba/paging_with_refs into lp:zorba
The proposal to merge lp:~davidagraf/zorba/paging_with_refs into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553 -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
The proposal to merge lp:~davidagraf/zorba/lastmodifiedfix into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712 -- https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712 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:~davidagraf/zorba/paging_with_refs into lp:zorba
> The patch looks great. > > As far as I can tell, the documentation should also mention the error > zerr:ZAPI0028. done -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553 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:~davidagraf/zorba/paging_with_refs into lp:zorba
> There are a few small fixes that I've sent as a patch via email as I could not > push them into this branch. Once this patch is applied this branch works for > me. I patched you patch. Unfortunately, I needed to do it by hand. Did you create the patch with bzr diff? -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553 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/deterministic-keys1g into lp:zorba
Review: Approve Very good. I need to do the same for the paging tests :-( -- https://code.launchpad.net/~zorba-coders/zorba/deterministic-keys1g/+merge/122729 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
> Which timezone is the last-modified dateTime returned? Is it the local time > zone or no timezone at all? local timezone -- https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
Bug #1014979: file:last-modified returns current date time -- https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712 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:~davidagraf/zorba/lastmodifiedfix into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/lastmodifiedfix into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712
--
https://code.launchpad.net/~davidagraf/zorba/lastmodifiedfix/+merge/122712
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-08-31 15:21:31 +
+++ ChangeLog 2012-09-04 16:07:25 +
@@ -23,6 +23,7 @@
* Fixed bug #1042840 (qname pool free-list corruption)
* Fixed bug #866984 (better error message for an eval error)
* Fixed bug #932884 (HTML and XHTML serialization of empty elements)
+ * Fixed bug #1045902 (file:last-modified returns current date time)
version 2.6
=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp 2012-08-30 13:45:43 +
+++ modules/org/expath/ns/file.xq.src/file.cpp 2012-09-04 16:07:25 +
@@ -603,11 +603,19 @@
// actual last modified
try {
time_t lTime = lFile->lastModified();
-struct tm *lT = localtime(&lTime);
+// result of localtime needs to be copied.
+// Otherwise, nasty side effecs do happen
+struct tm lT = *localtime(&lTime);
int gmtOffset = LastModifiedFunction::getGmtOffset();
return ItemSequence_t(new SingletonItemSequence(
- theModule->getItemFactory()->createDateTime(1900 + lT->tm_year, lT->tm_mon, lT->tm_mday, lT->tm_hour, lT->tm_min, lT->tm_sec, gmtOffset)));
+ theModule->getItemFactory()->createDateTime(1900 + lT.tm_year,
+ lT.tm_mon,
+ lT.tm_mday,
+ lT.tm_hour,
+ lT.tm_min,
+ lT.tm_sec,
+ gmtOffset)));
} catch (ZorbaException& ze) {
std::stringstream lSs;
lSs << "An unknown error occured: " << ze.what() << "Can not retrieve the last modification timestamp of";
--
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:~davidagraf/zorba/paging_index_probe into lp:zorba
The proposal to merge lp:~davidagraf/zorba/paging_index_probe into lp:zorba has been updated. Commit Message changed to: skip for value probe functions For more details, see: https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 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:~davidagraf/zorba/paging_index_probe into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/paging_index_probe into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621
skip for value probes
--
https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2012-08-30 13:45:43 +
+++ include/zorba/pregenerated/diagnostic_list.h 2012-09-04 07:00:27 +
@@ -750,6 +750,8 @@
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0065_STRINGS_IN_POOL;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0066_REFERENCED_NODE_NOT_IN_COLLECTION;
+
extern ZORBA_DLL_PUBLIC ZorbaErrorCode XSST0001;
extern ZORBA_DLL_PUBLIC ZorbaErrorCode XSST0002;
=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-08-30 13:45:43 +
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-09-04 07:00:27 +
@@ -781,6 +781,10 @@
(:~
:)
+declare variable $zerr:ZSTR0066 as xs:QName := fn:QName($zerr:NS, "zerr:ZSTR0066");
+
+(:~
+:)
declare variable $zerr:XSST0001 as xs:QName := fn:QName($zerr:NS, "zerr:XSST0001");
(:~
=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq 2012-08-30 13:45:43 +
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq 2012-09-04 07:00:27 +
@@ -632,6 +632,31 @@
(:~
+ : The collection function returns the sequence of nodes and/or json items
+ : that belong to the collection identified by the given name.
+ :
+ : @param $name The name of the collection.
+ : @param $start The reference to first node to return. All nodes before
+ are skipped (order is implementation dependent).
+ : @param $skip The number of collection items to skip. Might be negative to
+navigate relative from $start (order is
+implementation dependent).
+ :
+ : @return The sequence contained in the given collection.
+ :
+ : @error zerr:ZDDY0003 If available collections does not provide a mapping
+ :for the expanded QName $name.
+ : @error zerr:ZSTR0066 if the passed reference $start doesn't reference
+ : a not from the collection identified by $name.
+ :
+ :)
+declare function
+dml:collection($name as xs:QName,
+ $start as xs:anyURI,
+ $skip as xs:integer) as item()* external;
+
+
+(:~
: The collection-name function returns the name of the collection the given
: item (node or json item) belongs to.
:
=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq 2012-08-30 13:45:43 +
+++ modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq 2012-09-04 07:00:27 +
@@ -884,6 +884,29 @@
(:~
+ : The collection function returns the sequence of nodes and/or json items
+ : that belong to the collection identified by the given name.
+ :
+ : @param $name The name of the collection.
+ : @param $start The reference to first node to return. All nodes before
+ are skipped (order is implementation dependent).
+ : @param $skip The number of collection items to skip. Might be negative to
+navigate relative from $start (order is
+implementation dependent).
+ :
+ : @return The sequence contained in the given collection.
+ :
+ : @error zerr:ZDDY0001 if the collection identified by $name is not declared.
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ : @error zerr:ZSTR0066 if the passed reference $start doesn't reference
+ : a not from the collection identified by $name.
+ :
+ :)
+declare function
+cdml:collection($name as xs:QName,
+$start as xs:anyURI,
+$skip as xs:integer) as item()* external;
+(:~
: The collection-name function returns the name of the collection the given
: item (node or json item) belongs to.
:
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-08-31 12:40:20 +
+++ src/compiler/translator/translator.cpp 2012-09-04 07:00:27 +
@@ -1386,6 +1386,13 @@
else
paramType = theRTM.ANY_ATOMIC_TYPE_QUESTION;
}
+else if (func->getKind() == FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_POINT_VALUE_SKIP_N)
+{
+ if (i <= 1)
+paramType = sign[i];
+ else
+paramType = theRTM.ANY_ATOMIC_TYPE_QUESTION;
+}
else if (func->getKind() == FunctionConsts::FN_ZORBA_XQDD
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/paging_with_refs into lp:zorba
> - Given the documentation, I was not able to figure out why the collection > function takes the $start and $skip parameters. Is one of the ignored if > the other one is given? Does skipping start at the item identified by > $start? If so, would it make sense to separate the two ways of skipping > into separate functions? No, none is ignored. If you don't wanna skip, you pass 0. If you wanna skip only, you use db:collection($name, $skip). The goal was to not introduce additional function. I think there are already enough dml and ddl functions. If you want, I can make $skip optional. But as already mentioned in a yammer message, I am thinking about replacing the $skip parameter with an optimisation for fn:subsequence(db:collection(), $start). To get rid of additional stuff. > Fixed everything below: > - improved > The reference to first node to return > => > A reference to the first node to return. > > - What does "order is implementation dependent" mean for ordered collections? > > - Error message can be improved according to Paul's style: > > Node reference $1 doesn't reference a node in collection $2 > => > $1: doesn't reference a node in collection ($2) > > - typo: > if the passed reference $start doesn't reference > a _not_ from the collection identified by $name. > > - the documentation mention zerr:ZAPI0028 if the given URI > is not a valid node reference -- https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553 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:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba
This query doesn't work because the serializer of the query result throws an
error. The result of a query must not be an attribute. fn:trace does work on my
side:
./bin/zorba -q 'trace(attribute { "a" } { 1 }, "a")'
a [1]: a="1" <== fn:trace print
serialization error [err:SENR0001]: "1": can not serialize attribute node;
raised at /home/dagraf/zorba/sandbox/src/api/serialization/serializer.cpp:456
You need to execute something like: ./bin/zorba -q 'data(trace(attribute { "a"
} { 1 }, "a"))'
... to not see an error.
--
https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478
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:~davidagraf/zorba/paging_with_refs into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/paging_with_refs into
lp:zorba.
Requested reviews:
Till Westmann (tillw)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553
--
https://code.launchpad.net/~davidagraf/zorba/paging_with_refs/+merge/119553
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/functions/func_sequences_impl.cpp'
--- src/functions/func_sequences_impl.cpp 2012-08-14 11:13:50 +
+++ src/functions/func_sequences_impl.cpp 2012-08-14 14:29:21 +
@@ -543,16 +543,19 @@
ZorbaCollectionIterator& collection =
static_cast(*argv[0]);
-return new CountCollectionIterator(
- sctx,
- loc,
- collection.getChildren(),
- (
- collection.isDynamic()
- ? CountCollectionIterator::ZORBADYNAMIC
- : CountCollectionIterator::ZORBASTATIC
- )
- );
+if (collection.isCountOptimizable())
+{
+ return new CountCollectionIterator(
+ sctx,
+ loc,
+ collection.getChildren(),
+ (
+ collection.isDynamic()
+ ? CountCollectionIterator::ZORBADYNAMIC
+ : CountCollectionIterator::ZORBASTATIC
+ )
+ );
+}
}
else if (typeid(FnCollectionIterator) == counted_type)
{
=== modified file 'src/functions/pregenerated/func_collections.cpp'
--- src/functions/pregenerated/func_collections.cpp 2012-08-14 11:13:50 +
+++ src/functions/pregenerated/func_collections.cpp 2012-08-14 14:29:21 +
@@ -355,6 +355,20 @@
{
DECL_WITH_KIND(sctx, static_collections_dml_collection,
+(createQName("http://www.zorba-xquery.com/modules/store/static/collections/dml","","collection";),
+GENV_TYPESYSTEM.QNAME_TYPE_ONE,
+GENV_TYPESYSTEM.INTEGER_TYPE_ONE,
+GENV_TYPESYSTEM.ANY_URI_TYPE_ONE,
+GENV_TYPESYSTEM.STRUCTURED_ITEM_TYPE_STAR),
+FunctionConsts::STATIC_COLLECTIONS_DML_COLLECTION_3);
+
+ }
+
+
+
+
+ {
+DECL_WITH_KIND(sctx, static_collections_dml_collection,
(createQName("http://www.zorba-xquery.com/modules/store/dynamic/collections/dml","","collection";),
GENV_TYPESYSTEM.QNAME_TYPE_ONE,
GENV_TYPESYSTEM.STRUCTURED_ITEM_TYPE_STAR),
@@ -379,6 +393,20 @@
{
+DECL_WITH_KIND(sctx, static_collections_dml_collection,
+(createQName("http://www.zorba-xquery.com/modules/store/dynamic/collections/dml","","collection";),
+GENV_TYPESYSTEM.QNAME_TYPE_ONE,
+GENV_TYPESYSTEM.INTEGER_TYPE_ONE,
+GENV_TYPESYSTEM.ANY_URI_TYPE_ONE,
+GENV_TYPESYSTEM.STRUCTURED_ITEM_TYPE_STAR),
+FunctionConsts::DYNAMIC_COLLECTIONS_DML_COLLECTION_3);
+
+ }
+
+
+
+
+ {
DECL_WITH_KIND(sctx, static_collections_dml_collection_name,
(createQName("http://www.zorba-xquery.com/modules/store/static/collections/dml","","collection-name";),
GENV_TYPESYSTEM.STRUCTURED_ITEM_TYPE_ONE,
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h 2012-08-14 11:13:50 +
+++ src/functions/pregenerated/function_enum.h 2012-08-14 14:29:21 +
@@ -55,8 +55,10 @@
FN_COLLECTION_1,
STATIC_COLLECTIONS_DML_COLLECTION_1,
STATIC_COLLECTIONS_DML_COLLECTION_2,
+ STATIC_COLLECTIONS_DML_COLLECTION_3,
DYNAMIC_COLLECTIONS_DML_COLLECTION_1,
DYNAMIC_COLLECTIONS_DML_COLLECTION_2,
+ DYNAMIC_COLLECTIONS_DML_COLLECTION_3,
STATIC_COLLECTIONS_DML_COLLECTION_NAME_1,
DYNAMIC_COLLECTIONS_DML_COLLECTION_NAME_1,
STATIC_COLLECTIONS_DML_INDEX_OF_1,
=== modified file 'src/runtime/collections/collections_impl.cpp'
--- src/runtime/collections/collections_impl.cpp 2012-08-14 11:13:50 +
+++ src/runtime/collections/collections_impl.cpp 2012-08-14 14:29:21 +
@@ -367,6 +367,12 @@
}
}
+bool ZorbaCollectionIterator::isCountOptimizable() const
+{
+ // if ref is passed to the collections function, count cannot be
+ // optimized anymore.
+ return theChildren.size() <= 2;
+}
bool ZorbaCollectionIterator::nextImpl(
store::Item_t& result,
@@ -375,6 +381,7 @@
store::Item_t name;
store::Collection_t collection;
xs_integer lSkip;
+ zstring lStartAfterRef;
ZorbaCollectionIteratorState* state;
DEFAULT_STACK_INIT(ZorbaCollectionIteratorState, state, planState);
@@ -389,17 +396,26 @@
store::Item_t lSkipItem;
consumeNext(lSkipItem, theChildren[1].getp(), planState);
lSkip = lSkipItem->getIntegerValue();
-// negative is transformed into 0
-state->theIterator = ( lSkip > xs_integer::zero()
-
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1034582-macports-flex into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1034582-macports-flex into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1034582-macports-flex/+merge/119458 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1034582-macports-flex/+merge/119458 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:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478 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:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba
The proposal to merge lp:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba has been updated. Commit Message changed to: Because the jsoniq_emitter aggregates the xml_emitter, it needs to handover all the parameters. Inclusive aEmitAttributes. For more details, see: https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478 -- https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478 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/bug-1034582-macports-flex into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1034582-macports-flex/+merge/119458 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:~davidagraf/zorba/fn_trace_jsoniq_fix into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/fn_trace_jsoniq_fix into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
Till Westmann (tillw)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478
Because the jsoniq_emitter aggregates the xml_emitter, it needs to handover all
the parameters. Inclusive aEmitAttributes.
--
https://code.launchpad.net/~davidagraf/zorba/fn_trace_jsoniq_fix/+merge/119478
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp 2012-07-25 23:20:47 +
+++ src/api/serialization/serializer.cpp 2012-08-14 07:19:22 +
@@ -1220,11 +1220,12 @@
serializer::jsoniq_emitter::jsoniq_emitter(
serializer* the_serializer,
- std::ostream& the_stream)
+ std::ostream& the_stream,
+ bool aEmitAttributes)
:
emitter(the_serializer, the_stream),
theEmitterState(JESTATE_UNDETERMINED),
-theXMLEmitter(new xml_emitter(the_serializer, the_stream)),
+theXMLEmitter(new xml_emitter(the_serializer, the_stream, aEmitAttributes)),
theJSONEmitter(new json_emitter(the_serializer, the_stream))
{
}
@@ -2668,7 +2669,7 @@
else if (method == PARAMETER_VALUE_JSON)
e = new json_emitter(this, *tr);
else if (method == PARAMETER_VALUE_JSONIQ)
-e = new jsoniq_emitter(this, *tr);
+e = new jsoniq_emitter(this, *tr, aEmitAttributes);
#endif
else
{
=== modified file 'src/api/serialization/serializer.h'
--- src/api/serialization/serializer.h 2012-07-25 00:15:29 +
+++ src/api/serialization/serializer.h 2012-08-14 07:19:22 +
@@ -423,7 +423,10 @@
class jsoniq_emitter : public emitter
{
public:
-jsoniq_emitter(serializer* the_serializer, std::ostream& the_stream);
+jsoniq_emitter(
+serializer* the_serializer,
+std::ostream& the_stream,
+bool aEmitAttributes = false);
virtual ~jsoniq_emitter();
--
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:~davidagraf/zorba/virtual_destr_auditing into lp:zorba
Matthias, can you please review it again? -- https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584 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:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module
The proposal to merge lp:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 -- https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 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:~davidagraf/zorba/detect-clang-properly into lp:zorba
The proposal to merge lp:~davidagraf/zorba/detect-clang-properly into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 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:~davidagraf/zorba/detect-clang-properly into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 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:~davidagraf/zorba/detect-clang-properly into lp:zorba
Match does partial matches. c++ --version does return much more then 'clang' :-). -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 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:~davidagraf/zorba/virtual_destr_auditing into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584 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:~davidagraf/zorba/virtual_destr_auditing into lp:zorba
The proposal to merge lp:~davidagraf/zorba/virtual_destr_auditing into lp:zorba has been updated. Commit Message changed to: remove clang warnings in auditing code For more details, see: https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584 -- https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584 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:~davidagraf/zorba/virtual_destr_auditing into lp:zorba
The proposal to merge lp:~davidagraf/zorba/virtual_destr_auditing into lp:zorba has been updated. Description changed to: remove clang warnings in auditing code For more details, see: https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584 -- https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584 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:~davidagraf/zorba/virtual_destr_auditing into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/virtual_destr_auditing
into lp:zorba.
Requested reviews:
Till Westmann (tillw)
David Graf (davidagraf)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584
remove clang warnings in auditing code
--
https://code.launchpad.net/~davidagraf/zorba/virtual_destr_auditing/+merge/118584
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/audit.h'
--- include/zorba/audit.h 2012-07-24 08:48:48 +
+++ include/zorba/audit.h 2012-08-07 15:41:21 +
@@ -62,6 +62,8 @@
virtual const Property&property()const = 0;
virtual const String& stringValue() const = 0;
virtual long long longValue() const = 0;
+
+virtual ~Observation() {}
};
class ZORBA_DLL_PUBLIC Configuration {
@@ -93,6 +95,8 @@
virtual void add(const Property& prop, long long val) = 0;
virtual void add(const Property& prop, const String& val) = 0;
+
+virtual ~Record() {}
};
class ZORBA_DLL_PUBLIC Event {
@@ -122,6 +126,8 @@
virtual Event* createEvent(const Configuration*) = 0;
virtual void submitEvent(Event*) = 0;
+
+virtual ~Provider() {}
};
} /* namespace audit */
--
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/bug900677 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug900677 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/118048 -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/118048 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/bug900677 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug900677/+merge/118048 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
