Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188048
into lp:zorba/html-module.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
Related bugs:
Bug #1188048 in Zorba: Update non-core module html
https://bugs.launchpad.net/zorba/+bug/1188048
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730
Your team Zorba Coders is subscribed to branch lp:zorba/html-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2013-03-28 01:02:11 +
+++ src/CMakeLists.txt 2013-10-17 21:45:52 +
@@ -29,8 +29,8 @@
INCLUDE_DIRECTORIES (${LIBTIDY_INCLUDE_DIR})
INCLUDE_DIRECTORIES (html.xq.src)
DECLARE_ZORBA_SCHEMA (FILE html-options.xsd
- URI http://www.zorba-xquery.com/modules/converters/html-options;)
-DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/converters/html; VERSION 1.0 FILE html.xq LINK_LIBRARIES ${LIBTIDY_LIBRARIES})
+ URI http://zorba.io/modules/html-options;)
+DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/html; VERSION 1.0 FILE html.xq LINK_LIBRARIES ${LIBTIDY_LIBRARIES})
ADD_TEST_DIRECTORY (${PROJECT_SOURCE_DIR}/test)
ADD_TEST(zorba_html_module/link_crawler_test_for_compilation ${ZORBA_EXE} -f -q ${PROJECT_SOURCE_DIR}/test/Queries/link_crawler2.xq2 --compile-only)
=== modified file 'src/html-options.xsd'
--- src/html-options.xsd 2012-08-04 02:18:50 +
+++ src/html-options.xsd 2013-10-17 21:45:52 +
@@ -1,6 +1,6 @@
xs:schema xmlns:xs=http://www.w3.org/2001/XMLSchema;
- xmlns:ho=http://www.zorba-xquery.com/modules/converters/html-options;
- targetNamespace=http://www.zorba-xquery.com/modules/converters/html-options;
+ xmlns:ho=http://zorba.io/modules/html-options;
+ targetNamespace=http://zorba.io/modules/html-options;
elementFormDefault=qualified attributeFormDefault=unqualified
!--
@@ -37,4 +37,4 @@
/xs:sequence
/xs:complexType
/xs:element
-/xs:schema
\ No newline at end of file
+/xs:schema
=== modified file 'src/html.xq'
--- src/html.xq 2013-09-26 21:33:49 +
+++ src/html.xq 2013-10-17 21:45:52 +
@@ -18,7 +18,8 @@
(:~
: p
- : This module provides functions to a href=http://www.w3.org/People/Raggett/tidy/; target=_blanktidy/a a HTML document. br /
+ : This module provides functions to a href=http://www.w3.org/People/Raggett/tidy/; target=_blanktidy/a a HTML document. /p
+ : p
: The functions in this module take an HTML document (a string) as parameter,
: tidy it in order to result in valid XHTML, and return this XHTML document as a document-node.
: /p
@@ -29,14 +30,14 @@
: @project Zorba/Data Converters/HTML
:
:)
-module namespace html = http://www.zorba-xquery.com/modules/converters/html;;
+module namespace html = http://zorba.io/modules/html;;
(:~
: Import module for checking if html options element is validated.
:)
import module namespace schema = http://zorba.io/modules/schema;;
-import schema namespace html-options = http://www.zorba-xquery.com/modules/converters/html-options;;
+import schema namespace html-options = http://zorba.io/modules/html-options;;
declare namespace err = http://ww.w3.org/2005/xqt-errors;;
@@ -72,7 +73,7 @@
{
let $validated-options :=
validate {
- options xmlns=http://www.zorba-xquery.com/modules/converters/html-options;
+ options xmlns=http://zorba.io/modules/html-options;
tidyParam name=output-xml value=yes /
tidyParam name=doctype value=omit /
tidyParam name=quote-nbsp value=no /
@@ -98,7 +99,7 @@
: @param $html the HTML string to tidy
: @param $options a set of name and value pairs that provide options
:to configure the tidy process that have to be validated against the
- :http://www.zorba-xquery.com/modules/converters/html-options; schema.
+ :http://zorba.io/modules/html-options; schema.
: @return the tidied XHTML document node
:
: @error err:XQDY0027 if $options can not be validated against the
=== modified file 'src/html.xq.src/html.h'
--- src/html.xq.src/html.h 2013-08-05 14:21:05 +
+++ src/html.xq.src/html.h 2013-10-17 21:45:52 +
@@ -54,7 +54,7 @@
virtual ~HtmlModule();
virtual String
- getURI() const { return http://www.zorba-xquery.com/modules/converters/html;; }
+ getURI() const { return http://zorba.io/modules/html;; }
virtual ExternalFunction*
getExternalFunction(const String aLocalname);
=== modified file 'src/html.xq.src/tidy_wrapper.h'
--- src/html.xq.src/tidy_wrapper.h 2013-08-05 15:14:21 +
+++ src/html.xq.src/tidy_wrapper.h 2013-10-17 21:45:52 +
@@ -91,7 +91,7 @@
if (rc 1)
{
zorba::Item lError = Zorba::getInstance(0)-getItemFactory()-
-createQName(http://www.zorba-xquery.com/modules/converters/html;,
+createQName(http://zorba.io/modules/html
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188048 into lp:zorba/html-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for HTML module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188048/+merge/191730 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189789 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189789 into lp:zorba. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2013-10-16 18:45:10 + +++ doc/zorba/xqdoc/images/modules.svg 2013-10-16 21:50:22 + @@ -1776,7 +1776,7 @@ /g !-- 7 -- g id=node159 class=nodetitle7/title -a xlink:href=../www.zorba-xquery.com_modules_fetch.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch; +a xlink:href=../www.zorba-xquery.com_modules_fetch.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/fetch; ellipse fill=white stroke=white cx=5860 cy=-385 rx=28.3955 ry=18/ text text-anchor=middle x=5860 y=-381.3 font-family=Times,serif font-size=14.00 fill=redfetch/text /a @@ -2139,7 +2139,7 @@ /g !-- 11#45;gt;7 -- g id=edge172 class=edgetitle11-gt;7/title -a xlink:title=FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/fetch; +a xlink:title=FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://zorba.io/modules/fetch; path fill=none stroke=black d=M1218.5,-534.086C1294.83,-527.184 1495.8,-509.973 1664,-504 1678.42,-503.488 5807.16,-504.241 5819,-496 5845.61,-477.48 5854.98,-439.5 5858.26,-413.397/ polygon fill=black stroke=black points=5861.75,-413.674 5859.3,-403.366 5854.79,-412.953 5861.75,-413.674/ /a === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-10-16 19:15:37 + +++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-16 21:50:22 + @@ -1782,7 +1782,7 @@ /g !-- 5 -- g id=node159 class=nodetitle5/title -a xlink:href=../www.zorba-xquery.com_modules_fetch.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch; +a xlink:href=../www.zorba-xquery.com_modules_fetch.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/fetch; ellipse fill=white stroke=white cx=8579 cy=-407 rx=36.0624 ry=18.3848/ text text-anchor=middle x=8579 y=-403.4 font-family=Times Roman,serif font-size=14.00 fill=redfetch/text /a @@ -2152,7 +2152,7 @@ /g !-- 47#45;gt;5 -- g id=edge217 class=edgetitle47-gt;5/title -a xlink:title=FROM: http://zorba.io/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/fetch; +a xlink:title=FROM: http://zorba.io/modules/xqdoc, TO: http://zorba.io/modules/fetch; path fill=none stroke=black d=M1528.09,-569.535C1682.61,-563.822 2265.76,-543.017 2746,-536 2756.04,-535.853 8522.7,-533.648 8531,-528 8561.16,-507.489 8572.37,-464.752 8576.53,-435.963/ polygon fill=black stroke=black points=8580.05,-436.043 8577.81,-425.688 8573.11,-435.18 8580.05,-436.043/ /a @@ -2192,7 +2192,7 @@ /g !-- 30#45;gt;5 -- g id=edge209 class=edgetitle30-gt;5/title -a xlink:title=FROM: http://jsound.io/modules/validate, TO: http://www.zorba-xquery.com/modules/fetch; +a xlink:title=FROM: http://jsound.io/modules/validate, TO: http://zorba.io/modules/fetch; path fill=none stroke=black d=M9400.37,-567.144C9346.58,-559.55 9221.07,-542.803 9115,-536 9101.47,-535.132 8638.15,-535.708 8627,-528 8597,-507.263 8585.75,-464.585 8581.53,-435.871/ polygon fill=black stroke=black points=8584.96,-435.105 8580.23,-425.624 8578.02,-435.984 8584.96,-435.105/ /a === modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq' --- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-07 23:26:13 + +++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-16 21:50:22 + @@ -17,7 +17,7 @@ import module namespace xqdoc = http://zorba.io/modules/xqdoc;; import module namespace batch = http://www.zorba-xquery.com/modules/xqdoc/batch;; -import module namespace fetch = http://www.zorba-xquery.com/modules/fetch;; +import module namespace fetch = http://zorba.io/modules/fetch;; import module namespace xqdoc-html = http://www.zorba-xquery.com/xqdoc-html; at xqdoc-html.xqy; declare namespace xqd = http://www.xqdoc.org/1.0;; === modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy' --- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-07 23:26:13 + +++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-16 21:50:22 + @@ -28,7 +28,7 @@ import module namespace dot = http://www.zorba-xquery.com/modules/image/graphviz;; import module namespace xqd = http://zorba.io/modules/xqdoc;; -import module namespace fetch = http://www.zorba-xquery.com/modules/fetch;; +import module namespace fetch = http://zorba.io/modules/fetch;; import module namespace dml = http://www.zorba-xquery.com/modules/store/static/collections/dml;; import module namespace ddl = http://www.zorba-xquery.com/modules/store/static/collections/ddl;; import module namespace menu = http
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189789 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 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-1189789 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189789 into lp:zorba has been updated. Commit Message changed to: Changes for Zorba 3.0 for Fetch module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 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-1189788-dbgp into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 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-1189806 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 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-1189806 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189806 into lp:zorba has been updated. Commit Message changed to: Changes for Zorba 3.0 for URI module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 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-1189806 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189806
into lp:zorba.
Commit message:
Changes for Zorba 3.0 for URI module
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg 2013-10-09 02:52:32 +
+++ doc/zorba/xqdoc/images/modules.svg 2013-10-15 23:34:42 +
@@ -2041,7 +2041,7 @@
/g
!-- 10 --
g id=node202 class=nodetitle10/title
-a xlink:href=../www.zorba-xquery.com_modules_uri.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/uri;
+a xlink:href=../www.zorba-xquery.com_modules_uri.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/uri;
ellipse fill=white stroke=white cx=2034 cy=-385 rx=27 ry=18/
text text-anchor=middle x=2034 y=-381.3 font-family=Times,serif font-size=14.00 fill=reduri/text
/a
=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg 2013-10-15 20:04:59 +
+++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-15 23:34:42 +
@@ -2054,7 +2054,7 @@
/g
!-- 7 --
g id=node204 class=nodetitle7/title
-a xlink:href=../www.zorba-xquery.com_modules_uri.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/uri;
+a xlink:href=../www.zorba-xquery.com_modules_uri.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/uri;
ellipse fill=white stroke=white cx=3775 cy=-407 rx=27 ry=18.3848/
text text-anchor=middle x=3775 y=-403.4 font-family=Times Roman,serif font-size=14.00 fill=reduri/text
/a
=== modified file 'include/zorba/internal/pregenerated/qnames.h'
--- include/zorba/internal/pregenerated/qnames.h 2013-09-25 22:18:33 +
+++ include/zorba/internal/pregenerated/qnames.h 2013-10-15 23:34:42 +
@@ -92,6 +92,17 @@
zorba::diagnostic::kind kind() const;
};
+class ZORBA_DLL_PUBLIC ZorbaURIErrorQName :
+ public FixedQNameZorbaURIErrorQName,char const*
+{
+ typedef FixedQNameZorbaURIErrorQName,char const* base_type;
+public:
+ static char const NAMESPACE[];
+ static char const PREFIX[];
+ ZorbaURIErrorQName( char const *localname ) : base_type( localname ) { }
+ zorba::diagnostic::kind kind() const;
+};
+
} // namespace internal
typedef internal::SystemDiagnosticinternal::XQueryErrorQName XQueryErrorCode;
@@ -100,6 +111,7 @@
typedef internal::SystemDiagnosticinternal::ZorbaWarningQName ZorbaWarningCode;
typedef internal::SystemDiagnosticinternal::ZorbaCSVErrorQName ZorbaCSVErrorCode;
typedef internal::SystemDiagnosticinternal::ZorbaDateTimeErrorQName ZorbaDateTimeErrorCode;
+typedef internal::SystemDiagnosticinternal::ZorbaURIErrorQName ZorbaURIErrorCode;
} // namespace zorba
#endif /* ZORBA_INTERNAL_QNAMES_H */
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-09-25 22:18:33 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-10-15 23:34:42 +
@@ -879,12 +879,6 @@
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJ2X0001_JSONML_ARRAY_BAD_JSON;
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0001_OPAQUE_WITH_OTHERS;
-
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0002_SCHEME_REQUIRED_FOR_OPAQUE;
-
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0003_SLASH_NEEDED_FOR_ABSOLUTE_URI;
-
} // namespace zerr
namespace jerr {
@@ -986,6 +980,20 @@
extern ZORBA_DLL_PUBLIC ZorbaDateTimeErrorCode UNSUPPORTED_LOCALE;
} // namespace dt
+
+namespace zuri {
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode CHARSET_UNKNOWN;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode OPAQUE_COMB_NOT_VALID;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode OPAQUE_WITHOUT_SCHEME;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode INVALID_ABSOLUTE_PATH;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode URI_UNRESOLVED_OR_NOSTREAM;
+
+} // namespace zuri
} // namespace zorba
#endif /* ZORBA_DIAGNOSTIC_LIST_API_H */
/*
=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt 2013-10-14 22:29:56 +
+++ modules/CMakeLists.txt 2013-10-15 23:34:42 +
@@ -27,6 +27,7 @@
ADD_SUBDIRECTORY(sequence)
ADD_SUBDIRECTORY(store)
ADD_SUBDIRECTORY(structured-items)
+ADD_SUBDIRECTORY(uri)
ADD_SUBDIRECTORY(w3c)
ADD_SUBDIRECTORY(xml)
ADD_SUBDIRECTORY(zorba-query)
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-14 22:29:56 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-15 23:34:42 +
@@ -17,8 +17,6 @@
URI http://www.zorba-xquery.com/modules/fetch;)
DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0
URI http://www.zorba-xquery.com/modules/reflection;)
-DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
- URI http://www.zorba
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/set-uri-components into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/set-uri-components/+merge/190740 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/1189803-schema-tools into lp:zorba/schema-tools-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-schema-tools into lp:zorba/schema-tools-module. Commit message: Changes for Zorba 3.0 for schema module Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. === modified file 'src/schema-tools.xq' --- src/schema-tools.xq 2013-08-09 09:37:05 + +++ src/schema-tools.xq 2013-09-29 19:58:39 + @@ -41,7 +41,7 @@ (:~ : Import module for checking if options element is validated. :) -import module namespace schema-options = http://www.zorba-xquery.com/modules/schema;; +import module namespace schema-options = http://zorba.io/modules/schema;; declare namespace err = http://www.w3.org/2005/xqt-errors;; -- 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/1189803-schema-tools into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/1189803-schema-tools into lp:zorba/schema-tools-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for schema module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 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/1189803-schema-tools into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/1189803-geoproj-module into lp:zorba/geoproj-module
The proposal to merge lp:~zorba-coders/zorba/1189803-geoproj-module into lp:zorba/geoproj-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for schema module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-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/1189803-html into lp:zorba/html-module
The proposal to merge lp:~zorba-coders/zorba/1189803-html into lp:zorba/html-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for schema module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/1189803-html into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/1189803-html into lp:zorba/html-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-html into lp:zorba/html-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. === modified file 'src/html.xq' --- src/html.xq 2013-08-09 09:37:05 + +++ src/html.xq 2013-09-26 21:39:57 + @@ -34,7 +34,7 @@ (:~ : Import module for checking if html options element is validated. :) -import module namespace schema = http://www.zorba-xquery.com/modules/schema;; +import module namespace schema = http://zorba.io/modules/schema;; import schema namespace html-options = http://www.zorba-xquery.com/modules/converters/html-options;; -- 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/1189803-geoproj-module into lp:zorba/geoproj-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-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/1189803-geoproj-module into lp:zorba/geoproj-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-geoproj-module into lp:zorba/geoproj-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-module. === modified file 'src/geoproj.xq' --- src/geoproj.xq 2013-08-09 09:37:05 + +++ src/geoproj.xq 2013-09-26 22:08:06 + @@ -62,7 +62,7 @@ (:~ : pImport module for checking if geoproj parameters are validated./p :) -import module namespace schemaOptions = http://www.zorba-xquery.com/modules/schema;; +import module namespace schemaOptions = http://zorba.io/modules/schema;; (:~ -- 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/1189803-csv into lp:zorba/csv-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1189803-csv into lp:zorba/csv-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949 -- https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. === modified file 'src/csv.xq' --- src/csv.xq 2013-08-29 03:32:20 + +++ src/csv.xq 2013-09-26 22:41:04 + @@ -28,7 +28,7 @@ (:~ : Import module for checking if csv options element is validated. :) -import module namespace schemaOptions = http://www.zorba-xquery.com/modules/schema;; +import module namespace schemaOptions = http://zorba.io/modules/schema;; (:~ : Contains the definitions of the csv options element. -- 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-1188056-oauth into lp:zorba/oauth-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188056-oauth into lp:zorba/oauth-module has been updated. Commit Message changed to: hmac uri changed for the new one. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188056-oauth/+merge/186874 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056-oauth/+merge/186874 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188056 into lp:zorba/security-module
Looks like you will need to create a secondary merge proposal which updates the oauth module (which uses the hmac module that you're changing here). I just created lp:~zorba-coders/zorba/bug-1188056-oauth to change that uri. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188056-oauth into lp:zorba/oauth-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188056-oauth into lp:zorba/oauth-module. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188056-oauth/+merge/186874 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056-oauth/+merge/186874 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module. === modified file 'src/com/zorba-xquery/www/modules/oauth/client.xq' --- src/com/zorba-xquery/www/modules/oauth/client.xq 2013-08-09 10:33:54 + +++ src/com/zorba-xquery/www/modules/oauth/client.xq 2013-09-20 19:39:55 + @@ -31,7 +31,7 @@ module namespace oauth = http://www.zorba-xquery.com/modules/oauth/client;; import module namespace ra = http://zorba.io/modules/random;; -import module namespace hmac = http://www.zorba-xquery.com/modules/cryptography/hmac#2.0;; +import module namespace hmac = http://zorba.io/modules/hmac;; import module namespace http-client = http://expath.org/ns/http-client;; import schema namespace http = http://expath.org/ns/http-client;; -- 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-1188056-oauth into lp:zorba/oauth-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056-oauth/+merge/186874 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-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/1181360 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1181360/+merge/167690 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-1189806 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189806 into lp:zorba has been updated. Commit Message changed to: Changes for Zorba 3.0 for URI internal module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/183528 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/183528 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-1189803 into lp:zorba
Actually there's a lot more work to be done here - updating test cases, documentation, static_context... I changed all ocurrences of the uri except for the ones in Changelog. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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-1188056 into lp:zorba/security-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188056 into lp:zorba/security-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for security internal module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188041 into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188041 into lp:zorba/data-formatting-module has been updated. Commit Message changed to: Changes for Zorba 3.0 for data formatting internal module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023 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:~zorba-coders/zorba/bug-1188041 into lp:zorba/data-formatting-module
I think it makes sense to remove the Deprecated functions entirely at this point. Deprecated function is now removed. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023 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:~zorba-coders/zorba/bug-1189803 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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-1189803 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189803 into lp:zorba. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-09-02 20:43:22 + +++ modules/CMakeLists.txt 2013-09-10 20:49:19 + @@ -25,6 +25,7 @@ ADD_SUBDIRECTORY(json) ADD_SUBDIRECTORY(structured-items) ADD_SUBDIRECTORY(item) +ADD_SUBDIRECTORY(schema) # Add external module projects - any subdirectories of a directory === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-09-02 20:43:22 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-09-10 20:49:19 + @@ -19,8 +19,6 @@ URI http://www.zorba-xquery.com/modules/fetch;) DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0 URI http://www.zorba-xquery.com/modules/reflection;) -DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0 - URI http://www.zorba-xquery.com/modules/schema;) DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 URI http://www.zorba-xquery.com/modules/uri;) DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 === added directory 'modules/schema' === added file 'modules/schema/CMakeLists.txt' --- modules/schema/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/schema/CMakeLists.txt 2013-09-10 20:49:19 + @@ -0,0 +1,16 @@ +# Copyright 2013 The FLWOR Foundation. +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 1.0 + URI http://zorba.io/modules/schema;) === renamed file 'modules/com/zorba-xquery/www/modules/schema.xq' = 'modules/schema/schema.xq' --- modules/com/zorba-xquery/www/modules/schema.xq 2013-08-09 08:27:30 + +++ modules/schema/schema.xq 2013-09-10 20:49:19 + @@ -1,4 +1,4 @@ -xquery version 1.0; +xquery version 3.0; (: : Copyright 2006-2009 The FLWOR Foundation. @@ -24,9 +24,9 @@ : @project Zorba/XQuery Data Model/Item/Schema : :) -module namespace schema = http://www.zorba-xquery.com/modules/schema;; +module namespace schema = http://zorba.io/modules/schema;; declare namespace ver = http://zorba.io/options/versioning;; -declare option ver:module-version 2.0; +declare option ver:module-version 1.0; (:~ : This function returns the name of the type of the item passed -- 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-1189806 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189806 into lp:zorba. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/183528 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/183528 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-08-30 17:45:50 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-09-02 19:33:45 + @@ -21,8 +21,6 @@ URI http://www.zorba-xquery.com/modules/reflection;) DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0 URI http://www.zorba-xquery.com/modules/schema;) -DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 - URI http://www.zorba-xquery.com/modules/uri;) DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 URI http://www.zorba-xquery.com/modules/xqdoc;) DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd === added directory 'modules/uri' === added file 'modules/uri/CMakeLists.txt' --- modules/uri/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/uri/CMakeLists.txt 2013-09-02 19:33:45 + @@ -0,0 +1,16 @@ +# Copyright 2006-2013 The FLWOR Foundation. +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 + URI http://zorba.io/modules/uri;) === renamed file 'modules/com/zorba-xquery/www/modules/uri.xq' = 'modules/uri/uri.xq' --- modules/com/zorba-xquery/www/modules/uri.xq 2013-08-09 08:27:30 + +++ modules/uri/uri.xq 2013-09-02 19:33:45 + @@ -23,7 +23,7 @@ : @project Zorba/XQuery Data Model/Atomic/URI : :) -module namespace uri = http://www.zorba-xquery.com/modules/uri;; +module namespace uri = http://zorba.io/modules/uri;; declare namespace zerr = http://zorba.io/errors;; declare namespace ver = http://zorba.io/options/versioning;; -- 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-1188056 into lp:zorba/security-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790 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/bug-1188056 into lp:zorba/security-module
1. sha256 test failures. 2. There are error codes thrown like hmac:unsupported-algorithm; they should be like hmac:UNSUPPORTED_ALGORITHM, and the XQDoc should be updated accordingly. both errors are fixed now. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188056/+merge/182790 Your team Zorba Coders is subscribed to branch lp:zorba/security-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188041 into lp:zorba/data-formatting-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188041
into lp:zorba/data-formatting-module.
Requested reviews:
Chris Hillery (ceejatec)
Luis Rodriguez Gonzalez (kuraru)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2011-07-26 10:43:11 +
+++ src/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-MESSAGE(STATUS Add com)
-ADD_SUBDIRECTORY(com)
-
-MESSAGE(STATUS End modules)
=== renamed file 'src/com/zorba-xquery/www/modules/CMakeLists.txt' = 'src/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2013-01-22 13:19:42 +
+++ src/CMakeLists.txt 2013-08-29 20:57:52 +
@@ -76,7 +76,7 @@
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
-DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/xsl-fo;
+DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/xsl-fo;
VERSION 1.0 FILE xsl-fo.xq
LINK_LIBRARIES ${JAVA_JVM_LIBRARY} ${zorba_util-jvm_module_LIBRARIES})
=== removed directory 'src/com'
=== removed file 'src/com/CMakeLists.txt'
--- src/com/CMakeLists.txt 2011-10-06 08:17:52 +
+++ src/com/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-ADD_SUBDIRECTORY(zorba-xquery)
=== removed directory 'src/com/zorba-xquery'
=== removed file 'src/com/zorba-xquery/CMakeLists.txt'
--- src/com/zorba-xquery/CMakeLists.txt 2011-10-06 08:17:52 +
+++ src/com/zorba-xquery/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-ADD_SUBDIRECTORY(www)
=== removed directory 'src/com/zorba-xquery/www'
=== removed file 'src/com/zorba-xquery/www/CMakeLists.txt'
--- src/com/zorba-xquery/www/CMakeLists.txt 2011-10-06 08:17:52 +
+++ src/com/zorba-xquery/www/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-ADD_SUBDIRECTORY(modules)
=== removed directory 'src/com/zorba-xquery/www/modules'
=== renamed file 'src/com/zorba-xquery/www/modules/xsl-fo.xq
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188042 into lp:zorba/excel-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188042/+merge/181152 Your team Zorba Coders is subscribed to branch lp:zorba/excel-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188058 into lp:zorba/system-module
Looks very good, nice work. However, the moduleDocumentation test doesn't pass, so there must be a typo somewhere in the XQDoc. Also, I suspect once you fix that, it will complain that all those public variable declarations need to have XQDoc; you'll probably need to restore the doc from the old version. (%private variables, like errors codes, don't need XQDoc, but public ones do as far as I know.) Done. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188058/+merge/178905 Your team Zorba Coders is subscribed to branch lp:zorba/system-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189807-html into lp:zorba/html-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189807-html/+merge/176636 Your team Zorba Coders is subscribed to branch lp:zorba/html-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188058 into lp:zorba/system-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188058/+merge/178905 Your team Zorba Coders is subscribed to branch lp:zorba/system-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188058 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188058
into lp:zorba.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
Related bugs:
Bug #1188058 in Zorba: Update non-core module system
https://bugs.launchpad.net/zorba/+bug/1188058
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188058/+merge/178389
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188058/+merge/178389
Your team Zorba Coders is subscribed to branch lp:zorba.
=== added file 'CMakeLists.txt'
--- CMakeLists.txt 1970-01-01 00:00:00 +
+++ CMakeLists.txt 2013-08-02 21:22:34 +
@@ -0,0 +1,29 @@
+# Copyright 2006-2010 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+PROJECT (zorba_system_module)
+ENABLE_TESTING ()
+INCLUDE (CTest)
+
+LIST (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules)
+
+FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
+INCLUDE (${Zorba_USE_FILE})
+
+ADD_TEST_DIRECTORY(${PROJECT_SOURCE_DIR}/test)
+ADD_SUBDIRECTORY(src)
+
+DONE_DECLARING_ZORBA_URIS()
=== renamed file 'CMakeLists.txt' = 'CMakeLists.txt.moved'
=== added directory 'src'
=== renamed directory 'src' = 'src.moved'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/CMakeLists.txt 2013-08-02 21:22:34 +
@@ -0,0 +1,14 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/system; VERSION 1.0 FILE system.xq)
--
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-1189807 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189807/+merge/176627 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-1189784 into lp:zorba/sqlite-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189784
into lp:zorba/sqlite-module.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
Related bugs:
Bug #1189784 in Zorba: Update non-core module sqlite
https://bugs.launchpad.net/zorba/+bug/1189784
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489
Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2013-01-24 06:17:00 +
+++ src/CMakeLists.txt 2013-07-29 22:35:31 +
@@ -17,7 +17,7 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
DECLARE_ZORBA_MODULE (
- URI http://www.zorba-xquery.com/modules/sqlite;
+ URI http://zorba.io/modules/sqlite;
VERSION 1.0
FILE sqlite_module.xq
LINK_LIBRARIES ${SQLITE_LIBRARIES})
=== modified file 'src/sqlite_module.xq'
--- src/sqlite_module.xq 2013-06-15 19:48:35 +
+++ src/sqlite_module.xq 2013-07-29 22:35:31 +
@@ -1,4 +1,4 @@
-xquery version 3.0;
+jsoniq version 1.0;
(:
: Copyright 2012 The FLWOR Foundation.
@@ -17,15 +17,15 @@
:)
(:~
- : pThis module provides functionality to extract, add and modify data
- : from SQLite databases./p
+ : This module provides functionality to extract, add and modify data
+ : from SQLite databases.p/
:
: @author Luis Rodgriguez
: @library a href=http://www.sqlite.org/;SQLite/a
: @project DB Drivers/SQLite
:)
-module namespace s = http://www.zorba-xquery.com/modules/sqlite;;
+module namespace s = http://zorba.io/modules/sqlite;;
declare namespace an = http://www.zorba-xquery.com/annotations;;
declare namespace ver = http://www.zorba-xquery.com/options/versioning;;
declare option ver:module-version 1.0;
@@ -37,21 +37,23 @@
:
: @return the SQLite database object as xs:anyURI.
:
- : @error s:SQLI0001 if the database name doesn't exist or it couldn't be opened.
- : @error s:SQLI0008 if a non-in-memory database is requested and the module
- : is built without filesystem access
- : @error s:SQLI if there was an internal error inside SQLite library.
+ : @error s:CANT-OPEN-DB if the database name doesn't exist or it couldn't be
+ : opened.
+ : @error s:COMPILED-WITHOUT-DISK-ACCESS if a non-in-memory database is
+ : requested and the module is built without filesystem access.
+ : @error s:INTERNAL-SQLITE-PROBLEM if there was an internal error inside
+ : SQLite library.
:)
declare %an:sequential function s:connect(
$db-name as xs:string
) as xs:anyURI external;
(:~
- : Connect to a SQLite database with optional options.
+ : Connect to a SQLite database with optional options.p/
: All options are true/false values. Available options are: open-read-only,
: open-create, open-no-mutex, and open-shared-cache.
:
- : pThe options are of the form:
+ : The options are of the form:
: pre
: {
: open_read_only : true,
@@ -59,18 +61,20 @@
: ...
: }
: /pre
- : /p
+ : p/
:
: @param $db-name the SQLite database name to be opened as xs:string.
: @param $options a JSON object containing SQLite connection options.
:
: @return the SQLite database object as xs:anyURI.
:
- : @error s:SQLI0001 if the databse name doesn't exist or it couldn't be opened.
- : @error s:SQLI0007 if there is any unknown option specified.
- : @error s:SQLI0008 if a non-in-memory database is requested and the module
- : is built without filesystem access
- : @error s:SQLI if there was an internal error inside SQLite library.
+ : @error s:CANT-OPEN-DB if the database name doesn't exist or it couldn't be
+ : opened.
+ : @error s:UNKNOWN-OPTION if there is any unknown option specified.
+ : @error s:COMPILED-WITHOUT-DISK-ACCESS if a non-in-memory database is
+ : requested and the module is built without filesystem access.
+ : @error s:INTERNAL-SQLITE-PROBLEM if there was an internal error inside SQLite
+ : library.
:)
declare %an:sequential function s:connect(
$db-name as xs:string,
@@ -82,36 +86,40 @@
:
: @param $conn the SQLite database object as xs:anyURI.
:
- : @return true if the given SQLite database object is connected, false otherwise.
+ : @return true if the given SQLite database object is connected, false
+ : otherwise.
:
- : @error s:SQLI0002 if $conn is not a valid SQLite database object.
- : @error s:SQLI if there was an internal error inside SQLite library.
+ : @error s:INVALID-SQLITE-OBJECT if $conn is not a valid SQLite database object.
+ : @error s:INTERNAL-SQLITE-PROBLEM if there was an internal error inside SQLite
+ : library.
:)
declare %an:sequential function s:is-connected(
$conn as xs:anyURI ) as xs:boolean external;
(:~
- : Commits all the pending update operations in this SQLite database.
+ : Commits all pending update operations in this SQLite database.
:
: @param $conn
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188033 into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188033/+merge/176523 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188033 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188033 into lp:zorba/archive-module has been updated. Commit Message changed to: JSONiqfication for Archive Module Done. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188033/+merge/176523 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188033/+merge/176523 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
The proposal to merge lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module has been updated. Commit Message changed to: JSONiqfication for Sqlite Module Done! For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188033 into lp:zorba/archive-module
You didn't actually create singleton zorba::Items for the JSON object key strings. Using C++ #defines isn't the same. This code will still create a separate zorba::Item for the string name for every single entry in every archive passed to a:entries(). I used #defines only for the strings that are into the Item, I tried to create static Items into ArchiveModule but at the end I got some linker errors at execution time, I did some research but couldn't fix it so I moved the Items to be created in EntriesIterator and OptionsIterator that in theory created only once insstead of creating one for each entry and options. I will upload a version with the Items created in ArchiveModule and if you have a chance pleaase take a look and let me know if you know how to fix it. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188033/+merge/176523 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188033 into lp:zorba/archive-module
Also, you have at least one /p typo in archive.xq. Always remember to run ctest -R moduleDocumentation before committing, to be sure that your XQDoc is syntactically correct and that you didn't forget to document any parameters, etc. Done. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188033/+merge/176523 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189785-nosql into lp:zorba/oracle-nosql-db-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189785-oauth into lp:zorba/oauth-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-oauth/+merge/175217 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-archive into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189785-csv into lp:zorba/csv-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 Your team Zorba Coders is subscribed to branch lp:zorba/csv-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189794-core into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224 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-1189794-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189794-core into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224 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-1189794-oauth into lp:zorba/oauth-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189794-oauth into lp:zorba/oauth-module
The proposal to merge lp:~zorba-coders/zorba/bug-1189794-oauth into lp:zorba/oauth-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 Your team Zorba Coders is subscribed to branch lp:zorba/stack-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 Your team Zorba Coders is subscribed to branch lp:zorba/stack-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188062 into lp:zorba/queue-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946 Your team Zorba Coders is subscribed to branch lp:zorba/queue-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188062 into lp:zorba/queue-module
The proposal to merge lp:~zorba-coders/zorba/bug-1188062 into lp:zorba/queue-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946 Your team Zorba Coders is subscribed to branch lp:zorba/queue-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188062 into lp:zorba/queue-module
See the updated task description on the bug report. Also, see the updated coding guidelines for p and error codes. Documentation and code problems fixed, please check it again. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946 Your team Zorba Coders is subscribed to branch lp:zorba/queue-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module
After that, I'm afraid we've got some more substantive changes to be made to JSON-ify this module. I'll update the bug with details. If you'd like, we could merge this first pass (after you've addressed the coding guidelines issues) and then have a separate proposal for the JSONiq updates; otherwise you can continue working on this branch. I worked in the changes, please check it, also added some testcases for the new behavior. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 Your team Zorba Coders is subscribed to branch lp:zorba/stack-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module
The documentation has several mentions to tests that are included but no textual representations are made, Should I move some of the examples to the code instead of sending the user to check the tests? Aside from that the documentation seems to be pretty straight forward and all the errors that I can think for each case seems to be covered. Thanks, Luis. 2013/6/14 Chris Hillery chillery+launch...@lambda.nu Also, Luis: Have you done any investigation to ensure that the documentation is reasonable? In particular is the header comment clear, clean, and possibly have an example or two? And, can you verify that all reasonably-possible error conditions are documented? At least, are there any other XQuery error codes thrown by the module functions (or from the module C++ code, if any)? -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 You proposed lp:~zorba-coders/zorba/bug-1188061 for merging. -- The significant problems we face cannot be solved by the same level of thinking that created them. -- Albert Einstein https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 Your team Zorba Coders is subscribed to branch lp:zorba/stack-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188062 into lp:zorba/queue-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188062
into lp:zorba/queue-module.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188062/+merge/169946
Your team Zorba Coders is subscribed to branch lp:zorba/queue-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-02-29 09:08:58 +
+++ src/CMakeLists.txt 2013-06-17 21:13:28 +
@@ -15,6 +15,6 @@
# Queue data structure
-DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/store/data-structures/queue; VERSION 1.0 FILE queue.xq)
+DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/queue; VERSION 1.0 FILE queue.xq)
ADD_TEST_DIRECTORY(${PROJECT_SOURCE_DIR}/test)
=== modified file 'src/queue.xq'
--- src/queue.xq 2013-06-15 19:46:41 +
+++ src/queue.xq 2013-06-17 21:13:28 +
@@ -17,12 +17,12 @@
:)
(:~
- : Implementation of queue for node items, using dynamic collections.br /
+ : p Implementation of queue for node items, using dynamic collections.p/
:
: @author Daniel Turcanu, Sorin Nasoi
: @project Zorba/Data Store/Data Structures/Queue
:)
-module namespace queue = http://www.zorba-xquery.com/modules/store/data-structures/queue;;
+module namespace queue = http://zorba.io/modules/queue;;
import module namespace collections-ddl = http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl;;
import module namespace collections-dml = http://www.zorba-xquery.com/modules/store/dynamic/collections/dml;;
@@ -34,7 +34,7 @@
(:~
: Errors namespace URI.
:)
-declare variable $queue:errNS as xs:string := http://www.zorba-xquery.com/modules/store/data-structures/queue;;
+declare variable $queue:errNS as xs:string := http://zorba.io/modules/queue;;
(:~
: xs:QName with namespace URI=http://www.zorba-xquery.com/modules/store/data-structures/queue; and local name errNA
@@ -47,9 +47,10 @@
declare variable $queue:errExists as xs:QName := fn:QName($queue:errNS, queue:errExists);
(:~
- : Create a queue with this name. br / If queue exists, an error is raised.
+ : p Create a queue with the name given. If a queue with the given name already exists, an error is raised. p/
+ :
: @param $name name of the new queue.
- : @return ()
+ : @return an empty sequence.
: @error queue:errExists if the queue identified by $name already exists.
:)
declare %ann:sequential function queue:create($name as xs:QName) as empty-sequence()
@@ -61,7 +62,8 @@
};
(:~
- : Return the first node in the queue (the first added), without removing it.
+ : p Return the first node in the queue (the first added), without removing it. p/
+ :
: @param $name name of the queue.
: @return the first node, or empty sequence if queue is empty.
: @example test/Queries/front1.xq
@@ -76,7 +78,8 @@
};
(:~
- : Return the last node in the queue (the last added), without removing it.
+ : p Return the last node in the queue (the last added), without removing it. p/
+ :
: @param $name name of the queue.
: @return the last node, or empty sequence if queue is empty.
: @example test/Queries/back1.xq
@@ -91,7 +94,8 @@
};
(:~
- : Return the first node in the queue, and remove it.
+ : p Return the first node in the queue, and remove it. p/
+ :
: @param $name name of the queue.
: @return the first node, or empty sequence if queue is empty.
: @example test/Queries/pop2.xq
@@ -110,7 +114,8 @@
};
(:~
- : Add a new node to the queue; the queue will contain a copy of the given node.
+ : p Add a new node to the queue; the queue will contain a copy of the given node. p/
+ :
: @param $name name of the queue.
: @param $value the node to be added.
: @return ()
@@ -126,9 +131,10 @@
};
(:~
- : Checks if a queue exists and is empty.
+ : p Checks if a queue exists and is empty. p/
+ :
: @param $name name of the queue.
- : @return true is the queue is empty or does not exist.
+ : @return true is the queue is empty, false if it is not empty.
: @example test/Queries/empty1.xq
: @error queue:errNA if the queue identified by $name does not exist.
:)
@@ -141,7 +147,8 @@
};
(:~
- : Count of nodes in the queue.
+ : p Count of nodes in the queue. p/
+ :
: @param $name name of the queue.
: @return the count of nodes.
: @example test/Queries/size1.xq
@@ -156,12 +163,13 @@
};
(:~
- : Copy all nodes from source queue to a destination queue.br /
- : If destination queue does not exist, it is created first. br /
- : If destination queue is not empty, the nodes are appended last.
+ : p Copy all nodes from source queue to a destination queue.
+ : If destination queue does not exist, it is created first.
+ : If destination queue is not empty, the nodes are appended last. p/
+ :
: @param $destName name of the destination queue.
: @param $sourceName name of the source queue.
- : @return ()
+ : @return
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188061
into lp:zorba/stack-module.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553
Your team Zorba Coders is subscribed to branch lp:zorba/stack-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-02-29 08:49:50 +
+++ src/CMakeLists.txt 2013-06-14 22:52:43 +
@@ -15,6 +15,6 @@
# Stack data structure
-DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/store/data-structures/stack; VERSION 1.0 FILE stack.xq)
+DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/stack; VERSION 1.0 FILE stack.xq)
ADD_TEST_DIRECTORY(${PROJECT_SOURCE_DIR}/test)
=== modified file 'src/stack.xq'
--- src/stack.xq 2012-04-30 15:28:04 +
+++ src/stack.xq 2013-06-14 22:52:43 +
@@ -22,7 +22,7 @@
: @author Daniel Turcanu, Sorin Nasoi
: @project store/data structures
:)
-module namespace stack = http://www.zorba-xquery.com/modules/store/data-structures/stack;;
+module namespace stack = http://zorba.io/modules/stack;;
import module namespace collections-ddl = http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl;;
import module namespace collections-dml = http://www.zorba-xquery.com/modules/store/dynamic/collections/dml;;
@@ -34,7 +34,7 @@
(:~
: Errors namespace URI.
:)
-declare variable $stack:errNS as xs:string := http://www.zorba-xquery.com/modules/store/data-structures/stack;;
+declare variable $stack:errNS as xs:string := http://zorba.io/modules/stack;;
(:~
: xs:QName with namespace URI=http://www.zorba-xquery.com/modules/store/data-structures/stack; and local name errNA
@@ -47,10 +47,11 @@
declare variable $stack:errExists as xs:QName := fn:QName($stack:errNS, stack:errExists);
(:~
- : Create a stack with this name. br / If stack exists, an error is raised.
- : @param $name name of the new stack.
- : @return ()
- : @error stack:errExists if the stack identified by $name already exists.
+ : p Create a stack with this name. If stack exists, an error is raised. /p
+ :
+ : @param $name name of the new stack.
+ : @return an empty sequence.
+ : @error stack:errExists if the stack identified by $name already exists.
:)
declare %ann:sequential function stack:create($name as xs:QName) as empty-sequence()
{
@@ -61,11 +62,12 @@
};
(:~
- : Return the top node in the stack, without removing it.
- : @param $name name of the stack.
- : @return the top node, or empty sequence if stack is empty.
+ : p Return the top node in the stack, without removing it. /p
+ :
+ : @param $name name of the stack.
+ : @return the top node, or empty sequence if stack is empty.
: @example test/Queries/top1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error stack:errNA if the stack identified by $name does not exist.
:)
declare function stack:top($name as xs:QName) as node()?
{
@@ -76,11 +78,12 @@
};
(:~
- : Return the top node in the stack, and remove it.
- : @param $name name of the stack.
- : @return the top node, or empty sequence if stack is empty.
+ : p Return the top node in the stack, and remove it. /p
+ :
+ : @param $name name of the stack.
+ : @return the top node, or empty sequence if stack is empty.
: @example test/Queries/pop2.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error stack:errNA if the stack identified by $name does not exist.
:)
declare %ann:sequential function stack:pop($name as xs:QName) as node()?
{
@@ -95,12 +98,13 @@
};
(:~
- : Add a new node to the stack; the stack will contain a copy of the given node.
- : @param $name name of the stack.
- : @param $value the node to be added.
- : @return ()
+ : p Add a new node to the stack; the stack will contain a copy of the given node. /p
+ :
+ : @param $name name of the stack.
+ : @param $value the node to be added.
+ : @return an empty sequence.
: @example test/Queries/push1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error stack:errNA if the stack identified by $name does not exist.
:)
declare %ann:sequential function stack:push($name as xs:QName, $value as node()) as empty-sequence()
{
@@ -108,11 +112,12 @@
};
(:~
- : Checks if a stack exists and is empty.
- : @param $name name of the stack.
- : @return true is the stack is empty or does not exist.
+ : p Checks if a stack exists and is empty. /p
+ :
+ : @param $name name of the stack.
+ : @return true if the stack is empty or does not exist.
: @example test/Queries/empty1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error stack:errNA if the stack identified by $name does not exist.
:)
declare function stack:empty($name as xs:QName) as xs:boolean
{
@@ -123,11 +128,12
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/1181360 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1181360
into lp:zorba.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Cezar Andrei (cezar-andrei)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/1181360/+merge/167690
--
https://code.launchpad.net/~zorba-coders/zorba/1181360/+merge/167690
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-06-04 00:34:52 +
+++ src/diagnostics/diagnostic_en.xml 2013-06-06 04:36:34 +
@@ -3676,6 +3676,10 @@
entry key=DocNodeMultipleElements
valuedocument node has more than one element/value
/entry
+
+entry key=DocNodeNoElements
+ valuedocument node doesn't contain any elements, must contain exactly one element/value
+/entry
entry key=EBVNotDefSeq_5
valueeffective boolean value not defined for sequence of more than one item that starts with $5/value
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-06-04 01:32:30 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-06-06 04:36:34 +
@@ -610,6 +610,7 @@
{ ~DivisionNoINF, division can not have +-INF dividend },
{ ~DivisionNoNaN, division can not involve NaN },
{ ~DocNodeMultipleElements, document node has more than one element },
+ { ~DocNodeNoElements, document node doesn't contain any elements, must contain exactly one element },
{ ~EBVNotDefSeq_5, effective boolean value not defined for sequence of more than one item that starts with \$5\ },
{ ~EffectiveBooleanValue, effective boolean value },
{ ~ElementName, element name },
=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
--- src/diagnostics/pregenerated/dict_zed_keys.h 2013-05-16 22:26:07 +
+++ src/diagnostics/pregenerated/dict_zed_keys.h 2013-06-06 04:36:34 +
@@ -223,6 +223,7 @@
#define ZED_DivisionNoINF ~DivisionNoINF
#define ZED_DivisionNoNaN ~DivisionNoNaN
#define ZED_DocNodeMultipleElements ~DocNodeMultipleElements
+#define ZED_DocNodeNoElements ~DocNodeNoElements
#define ZED_EBVNotDefSeq_5 ~EBVNotDefSeq_5
#define ZED_EffectiveBooleanValue ~EffectiveBooleanValue
#define ZED_ElementName ~ElementName
=== modified file 'src/types/schema/validate.cpp'
--- src/types/schema/validate.cpp 2013-05-21 21:44:25 +
+++ src/types/schema/validate.cpp 2013-06-06 04:36:34 +
@@ -136,6 +136,15 @@
nr_child_elements++;
}
}
+// if nr_child_elements == 0 thow an error since it means there isn't any child element
+if(nr_child_elements == 0)
+{
+ throw XQUERY_EXCEPTION(
+err::XQDY0061,
+ERROR_PARAMS( ZED( DocNodeNoElements ) ),
+ERROR_LOC( loc )
+ );
+}
}
Schema* schema = typeManager-getSchema();
--
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-1181360 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1181360
into lp:zorba.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Cezar Andrei (cezar-andrei)
Related bugs:
Bug #1181360 in Zorba: validation leaks exception
https://bugs.launchpad.net/zorba/+bug/1181360
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1181360/+merge/166890
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1181360/+merge/166890
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-05-24 22:52:47 +
+++ src/diagnostics/diagnostic_en.xml 2013-05-31 20:35:39 +
@@ -3676,6 +3676,10 @@
entry key=DocNodeMultipleElements
valuedocument node has more than one element/value
/entry
+
+entry key=DocNodeNoElements
+ valuedocument node doesn't contain any elements, must contain exactly one element/value
+/entry
entry key=EBVNotDefSeq_5
valueeffective boolean value not defined for sequence of more than one item that starts with $5/value
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-05-24 22:52:47 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-05-31 20:35:39 +
@@ -610,6 +610,7 @@
{ ~DivisionNoINF, division can not have +-INF dividend },
{ ~DivisionNoNaN, division can not involve NaN },
{ ~DocNodeMultipleElements, document node has more than one element },
+ { ~DocNodeNoElements, document node doesn't contain any elements, must contain exactly one element },
{ ~EBVNotDefSeq_5, effective boolean value not defined for sequence of more than one item that starts with \$5\ },
{ ~EffectiveBooleanValue, effective boolean value },
{ ~ElementName, element name },
=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
--- src/diagnostics/pregenerated/dict_zed_keys.h 2013-05-16 22:26:07 +
+++ src/diagnostics/pregenerated/dict_zed_keys.h 2013-05-31 20:35:39 +
@@ -223,6 +223,7 @@
#define ZED_DivisionNoINF ~DivisionNoINF
#define ZED_DivisionNoNaN ~DivisionNoNaN
#define ZED_DocNodeMultipleElements ~DocNodeMultipleElements
+#define ZED_DocNodeNoElements ~DocNodeNoElements
#define ZED_EBVNotDefSeq_5 ~EBVNotDefSeq_5
#define ZED_EffectiveBooleanValue ~EffectiveBooleanValue
#define ZED_ElementName ~ElementName
=== modified file 'src/types/schema/EventSchemaValidator.cpp'
--- src/types/schema/EventSchemaValidator.cpp 2013-04-24 21:40:21 +
+++ src/types/schema/EventSchemaValidator.cpp 2013-05-31 20:35:39 +
@@ -163,7 +163,7 @@
StrX typeName(theSchemaValidatorFilter-getTypeName());
StrX typeUri(theSchemaValidatorFilter-getTypeUri());
- //cout esv - : getTypeQName:typeName @ typeUri \n; std::cout.flush();
+ //std::cout esv - : getTypeQName:typeName @ typeUri \n; std::cout.flush();
store::Item_t typeQName;
GENV_ITEMFACTORY-createQName(typeQName,
=== modified file 'src/types/schema/SchemaValidatorFilter.cpp'
--- src/types/schema/SchemaValidatorFilter.cpp 2013-04-24 21:40:21 +
+++ src/types/schema/SchemaValidatorFilter.cpp 2013-05-31 20:35:39 +
@@ -1069,7 +1069,7 @@
if(fValidate || theXsiType)
{
-//cout- getTypeQName: theElemDepth: theElemDepth \n;
+//std::cout- getTypeQName: theElemDepth: theElemDepth \n;
if (theProcessorStipulatedTypeName theElemDepth == 0 )
{
typeName = theProcessorStipulatedTypeName;
@@ -1077,6 +1077,7 @@
else
{
const ElemStack::StackElem* topElem = fElemStack.topElement();
+
DatatypeValidator *currentDV = 0;
if(topElem-fThisElement-isDeclared() ||
theXsiType // this is when there is no schema import but xsiType is used
@@ -1084,7 +1085,6 @@
{
ComplexTypeInfo *currentTypeInfo = ((XercSchemaValidator*)fValidator)-
getCurrentTypeInfo();
-
if(currentTypeInfo)
{
typeName = currentTypeInfo-getTypeLocalName();
=== modified file 'src/types/schema/validate.cpp'
--- src/types/schema/validate.cpp 2013-05-21 21:44:25 +
+++ src/types/schema/validate.cpp 2013-05-31 20:35:39 +
@@ -52,6 +52,7 @@
#include context/namespace_context.h
#include diagnostics/assert.h
+#include diagnostics/util_macros.h
#include zorba/store_consts.h
//using namespace std;
@@ -92,7 +93,6 @@
}
}
-
bool Validator::realValidationValue(
store::Item_t result,
const store::Item_t sourceNode,
@@ -125,6 +125,7 @@
if ( child-isNode()
child-getNodeKind() == store::StoreConsts::elementNode)
{
+ std::cout The node is a elementNode std::endl;
if (nr_child_elements)
{
throw XQUERY_EXCEPTION(
@@ -136,6 +137,15 @@
nr_child_elements++;
}
}
+// if nr_child_elements == 0 thow an error since it means there isn't any child element
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/prune-test-dir into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/prune-test-dir/+merge/163672 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-2.9 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.9/+merge/162732 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-2.9 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-2.9 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-2.9/+merge/162732 -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.9/+merge/162732 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-1015468 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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-867376 into lp:zorba
- Could you give an example in the documentation of uri:parse and show a
resulting URI object?
Done
- The names of the variables are all upper-case. I know that we don't have any
coding conventions for it but the names in the full-text module are all lower-
case. Should we be consistent here?
Done
- uri:parse(foo:bar?) returns [err:XQST0046]: bar?: invalid URI literal:
63: invalid character code-point
1. why?
2. the function documentation doesn't mention that this could be raised
- uri:parse(http://foo.com/bc?;) returns { scheme : http, host :
foo.com, path : /bc }. Should it return the query part as empty in the
JSON object?
Done. I had to change some inner parts of URI class from protected to public.
- one test doesn't seem to succeed in the queue
I can't figure out what test case went wrong. In the log it only says that
something produced a segment fault, but I don't recognize the code that
produced it. How can I find the exact test case name and error?
--
https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233
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-1015468 into lp:zorba
I followed Chris' suggestion and now we use the full path to build the reference in the case when we don't have a path in the relative URI. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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-867376 into lp:zorba
I will include the 3 different errors for uri:serialize(), Should I leave uri:parse() without any error code? I'm sure there are some reasonable errors for uri:parse(), but I'm not totally sure what they might be. It's possible that URI.cpp will already throw some exceptions if you try to parse a bogus URI, and that might well be good enough. Matthias, can you think of any specific error cases that we should test out? Actually you are right, the current underlying library throws some exceptions already. -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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-867376 into lp:zorba
There are still some test failures. serialize-direct-uris now throws ZURI errors, which is good, but the test needs to be adapted for that (split the failing cases into separate tests with a .spec file containing the Error: you expect). More worrying, FOTS/fn-resolve-uri is failing. I'm looking into that one a bit. All failing (as expected) cases were moved to individual test cases. Added also a couple of more to test the other 2 errors (ZURI0001 and ZURI0002). -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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-1015468 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1015468
into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1015468 in Zorba: wrong uri resolution with fn:resolve-uri()
https://bugs.launchpad.net/zorba/+bug/1015468
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/test_uri.cpp'
--- src/unit_tests/test_uri.cpp 2013-02-07 17:24:36 +
+++ src/unit_tests/test_uri.cpp 2013-04-30 22:07:29 +
@@ -608,7 +608,21 @@
,
,
localhost/Ångström/b/c // path notation
-}
+},
+{
+ file:///test.xml,
+ #id,
+ file:///test.xml#id,
+ file,
+ 0,
+ id,
+ ,
+ ,
+ /test.xml,
+ ,
+ ,
+ /test.xml
+ }
}; // URITestEntry tests[]
=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp 2013-02-07 17:24:36 +
+++ src/zorbatypes/URI.cpp 2013-04-30 22:07:29 +
@@ -1279,7 +1279,7 @@
base_uri-get_path(path);
zstring::size_type last_slash = path.rfind(/);
- if ( last_slash != zstring::npos )
+ if ( last_slash != zstring::npos (last_slash != 0) )
thePath = path.substr(0, last_slash+1);
else
thePath = path;
@@ -1287,7 +1287,8 @@
set_state(Path);
}
-if ( (! is_set(QueryString)) )
+if ( !is_set(QueryString) base_uri-is_set(QueryString)
+ !base_uri-get_encoded_query().empty() )
{
base_uri-get_query(theQueryString);
--
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-867376 into lp:zorba
As for the error condition, I've been thinking about it more, and I'm pretty sure that uri:serialize() needs to enforce at least the following rules: 1. You can specify opaque-part, OR some subset of host/port/path/user- info/query. Not both. (Put another way: If opaque-part is specified, then only scheme and fragment may be additionally be specified.) 2. If you specify opaque-part, scheme is required. 3. If you specify a scheme and a path, then the path MUST start with a / character. I would suggest introducing a zerr:ZURI0001 malformed URI components error message for uri:serialize() which is thrown if any of the above rules are broken, as well as some new test cases for each of them. It might be nice to have separate errors for each, I guess - ZURI0001 cannot specify opaque-part in conjunction with host/port/path/user-info/query, ZURI0002 scheme required when specifying opaque-part, and ZURI0003 path component of absolute URI (ie, one with a scheme) must begin with /. I will include the 3 different errors for uri:serialize(), Should I leave uri:parse() without any error code? I see that in the previous function in the same module they use some predefined XQueryErrorCode inside diagnostic_list.h, Should I include my own codes there? -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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/1025564 into lp:zorba
Comments fixed, please re-review. -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/sqlite-check-for-metadata-availability into lp:zorba/sqlite-module
I think this branch is corrected as Chris suggested. Please re-review. -- https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1130998 into lp:zorba
I followed Nicolae's suggestions but still I get the same problems. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
I just updated the branch. -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/120438 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/sqlite-check-for-metadata-availability into lp:zorba/sqlite-module
Luis Rodriguez Gonzalez has proposed merging
lp:~zorba-coders/zorba/sqlite-check-for-metadata-availability into
lp:zorba/sqlite-module.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1102549 in Zorba: SQLite module doesn't link on MacOS
https://bugs.launchpad.net/zorba/+bug/1102549
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041
- New feature detection code added to CMake to be sure that SQLite is able to
read metadata (fix for Mac OSX)
--
https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041
Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module.
=== modified file 'cmake_modules/FindSQLite3.cmake'
--- cmake_modules/FindSQLite3.cmake 2012-11-20 16:41:36 +
+++ cmake_modules/FindSQLite3.cmake 2013-01-25 23:35:26 +
@@ -39,8 +39,9 @@
SET(CMAKE_REQUIRED_INCLUDES ${SQLITE_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${SQLITE_LIBRARY})
-# INCLUDE(CheckFunctionExists)
-# CHECK_FUNCTION_EXISTS(archive_write_zip_set_compression_deflate #ZORBA_LIBARCHIVE_HAVE_SET_COMPRESSION)
+
+ INCLUDE(CheckFunctionExists)
+ CHECK_FUNCTION_EXISTS(sqlite3_column_database_name ZORBA_SQLITE_HAVE_METADATA)
ELSE (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
SET (SQLITE_FOUND 0)
SET (SQLITE_LIBRARIES)
=== modified file 'src/config.h.cmake'
--- src/config.h.cmake 2013-01-24 06:17:00 +
+++ src/config.h.cmake 2013-01-25 23:35:26 +
@@ -21,5 +21,6 @@
#define ZORBA_SQLITE_CONFIG_H
#cmakedefine SQLITE_WITH_FILE_ACCESS
+#cmakedefine ZORBA_SQLITE_HAVE_METADATA
#endif /* ZORBA_SQLITE_CONFIG_H */
=== modified file 'src/sqlite_module.xq'
--- src/sqlite_module.xq 2013-01-24 06:17:00 +
+++ src/sqlite_module.xq 2013-01-25 23:35:26 +
@@ -68,6 +68,8 @@
:
: @error s:SQLI0001 if the databse name doesn't exist or it couldn't be opened.
: @error s:SQLI0007 if there is any unknown option specified.
+ : @error s:SQLI0008 if a non-in-memory database is requested and the module
+ : is built without filesystem access
: @error s:SQLI if there was an internal error inside SQLite library.
:)
declare %an:sequential function s:connect(
@@ -173,6 +175,8 @@
: @return a object() with the associated the metadata.
:
: @error s:SQLI0004 if $pstmnt is not a valid SQLite prepared statement.
+ : @error s:SQLI0009 if no metadata is available (SQLite library compiled without
+ : SQLITE_ENABLE_COLUMN_METADATA).
: @error s:SQLI if there was an internal error inside SQLite library.
:)
declare %an:sequential function s:metadata(
=== modified file 'src/sqlite_module.xq.src/sqlite_module.cpp'
--- src/sqlite_module.xq.src/sqlite_module.cpp 2013-01-24 06:17:00 +
+++ src/sqlite_module.xq.src/sqlite_module.cpp 2013-01-25 23:35:26 +
@@ -573,6 +573,12 @@
return Only in-memory databases are allowed (Module built without filesystem access);
}
#endif /* not SQLITE_WITH_FILE_ACCESS */
+#ifndef ZORBA_SQLITE_HAVE_METADATA
+else if(error == SQLI0009)
+{
+ return Metadata not found (SQLite built without SQLITE_ENABLE_COLUMN_METADATA);
+}
+#endif /* not ZORBA_SQLITE_HAVE_METADATA */
else if(error == SQLI)
{
return Internal error ocurred;
@@ -826,6 +832,7 @@
int lNotNull, lPrimaryKey, lAutoinc, lRc;
if(theRc == SQLITE_ROW){
+#ifdef ZORBA_SQLITE_HAVE_METADATA
// Get the metadata for 'theActualColumn' column
// in a key = value fashion
lDbHandle = sqlite3_db_handle(theStmt);
@@ -867,6 +874,7 @@
aKey = theFactory-createString(autoincrement);
aValue = theFactory-createBoolean((lAutoinc==0)?false:true);
elements.push_back(std::pairzorba::Item, zorba::Item(aKey, aValue));
+#endif
aItem = theFactory-createJSONObject(elements);
elements.clear();
// Get more data if available
@@ -1068,6 +1076,7 @@
const zorba::StaticContext* aSctx,
const zorba::DynamicContext* aDctx) const
{
+#ifdef ZORBA_SQLITE_HAVE_METADATA
sqlite3_stmt *lPstmt;
zorba::Item lItemPstmt = getOneItem(aArgs, 0);
zorba::Item lVecItem, lJSONKey, lJSONArray, lJSONRes;
@@ -1101,6 +1110,9 @@
lJSONRes = lFactory-createJSONObject(lVectorRes);
return ItemSequence_t(new SingletonItemSequence(lJSONRes));
+#else
+throwError(SQLI0008, getErrorMessage(SQLI0008));
+#endif
}
/***
=== added file 'test/Queries/test3.spec'
--- test/Queries/test3.spec 1970-01-01 00:00:00 +
+++ test/Queries/test3.spec 2013-01-25 23:35:26 +
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/modules/sqlite:SQLI0009
=== added file 'test/Queries/test4.spec'
--- test/Queries/test4.spec 1970-01-01 00:00:00 +
+++ test/Queries/test4.spec 2013-01-25 23:35:26 +
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/modules/sqlite:SQLI0009
=== added file 'test/Queries
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/sqlite-with-file-access into lp:zorba/sqlite-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/sqlite-with-file-access/+merge/144641 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-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/sqlite-with-file-access into lp:zorba/sqlite-module
The proposal to merge lp:~zorba-coders/zorba/sqlite-with-file-access into lp:zorba/sqlite-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/sqlite-with-file-access/+merge/144641 -- https://code.launchpad.net/~zorba-coders/zorba/sqlite-with-file-access/+merge/144641 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-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/canonicalize-core-fixed into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/canonicalize-core-fixed/+merge/142394 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-for-sqlite into lp:zorba
A new SQLite module version is now uploaded. I fixed most of the problems but I'm still testing out things. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-for-sqlite/+merge/139108 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/1039576 into lp:zorba/archive-module
- Added documentation changes to include entry@type attribute. -- https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-windows-fixes into lp:zorba
Luis Rodriguez Gonzalez has proposed merging
lp:~zorba-coders/zorba/zorba-windows-fixes into lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fixes/+merge/141005
- Fixes for Windows and VC++ 2010
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fixes/+merge/141005
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/rewriter/tools/dataflow_annotations.cpp'
--- src/compiler/rewriter/tools/dataflow_annotations.cpp 2012-12-06 22:49:35 +
+++ src/compiler/rewriter/tools/dataflow_annotations.cpp 2012-12-20 22:25:25 +
@@ -919,7 +919,7 @@
case var_expr::arg_var:
{
- theVarSourcesMap.insert(VarSourcesPair(e, NULL));
+ theVarSourcesMap.insert(VarSourcesPair(e, nullptr));
return;
}
=== modified file 'src/zorbautils/hashmap.h'
--- src/zorbautils/hashmap.h 2012-10-29 12:37:50 +
+++ src/zorbautils/hashmap.h 2012-12-20 22:25:25 +
@@ -513,9 +513,9 @@
csize n = theHashTab.size();
HashEntryT, V* entry = theHashTab[0];
- HashEntryT, V* lastentry = theHashTab[n];
+ HashEntryT, V* lastentry = theHashTab[n-1];
- for (; entry lastentry; ++entry)
+ for (; entry = lastentry; ++entry)
{
if (!entry-isFree())
entry-setFree();
@@ -1065,10 +1065,10 @@
HashEntryT, V* entry;
HashEntryT, V* oldentry = oldTab[0];
- HashEntryT, V* lastentry = oldTab[oldcap];
+ HashEntryT, V* lastentry = oldTab[oldcap-1];
// Now rehash every entry
- for (; oldentry lastentry; ++oldentry)
+ for (; oldentry = lastentry; ++oldentry)
{
if (oldentry-isFree())
continue;
--
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-for-sqlite into lp:zorba
I fixed the problems Chris pointed out. Please review. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-for-sqlite/+merge/139108 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/bug1091844 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1091844/+merge/140539 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-for-sqlite into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/zorba-for-sqlite into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Chris Hillery (ceejatec) Rodolfo Ochoa (rodolfo-ochoa) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-for-sqlite/+merge/139108 Added sqlite module to ExternalModules.conf -- https://code.launchpad.net/~zorba-coders/zorba/zorba-for-sqlite/+merge/139108 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2012-11-08 14:07:24 + +++ modules/ExternalModules.conf 2012-12-10 22:21:21 + @@ -47,4 +47,5 @@ schema-toolsbzr lp:zorba/schema-tools-module zorba-2.7 stack bzr lp:zorba/stack-modulezorba-2.7 queue bzr lp:zorba/queue-modulezorba-2.7 +sqlite bzr lp:zorba/sqlite-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/1039576 into lp:zorba/archive-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1039576
into lp:zorba/archive-module.
Requested reviews:
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #1039576 in Zorba: archive module doesnt create directory entries
https://bugs.launchpad.net/zorba/+bug/1039576
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170
- Added ability to create directories in archives
- Added testcases
--
https://code.launchpad.net/~zorba-coders/zorba/1039576/+merge/123170
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.
=== modified file 'src/archive.xsd'
--- src/archive.xsd 2012-08-01 20:47:46 +
+++ src/archive.xsd 2012-09-06 20:59:23 +
@@ -53,6 +53,13 @@
xs:restriction base=xs:string/
/xs:simpleType
+ xs:simpleType name=entry-type
+xs:restriction base=xs:string
+ xs:enumeration value=regular/
+ xs:enumeration value=directory/
+/xs:restriction
+ /xs:simpleType
+
!-- elements --
xs:element name=archive-option-element
abstract=true type=xs:string/
@@ -88,6 +95,7 @@
!-- entry attributes --
xs:attributeGroup name=entry-attributes
+xs:attribute name=type type=entry-type/
xs:attribute name=size type=entry-size-type/
xs:attribute name=last-modified type=entry-datetime-type/
xs:attribute name=encoding type=entry-encoding-type/
=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp 2012-08-03 04:53:47 +
+++ src/archive_module.xq.src/archive_module.cpp 2012-09-06 20:59:23 +
@@ -119,6 +119,8 @@
gmtime_r(aTime, gmtm);
#endif
+// create a datetime item without timezone because
+// this is what the entry tells us (at least for zip)
Item lModifiedItem = getItemFactory()-createDateTime(
static_castshort(gmtm.tm_year + 1900),
static_castshort(gmtm.tm_mon + 1),
@@ -167,7 +169,8 @@
**/
ArchiveFunction::ArchiveEntry::ArchiveEntry()
-: theEncoding(UTF-8)
+: theEncoding(UTF-8),
+ theEntryType(regular)
{
// use current time as a default for each entry
#if defined (WIN32)
@@ -187,7 +190,7 @@
if (archive_entry_size_is_set(aEntry))
{
- //add a size variable
+ theSize = (int)archive_entry_size(aEntry);
}
if (archive_entry_mtime_is_set(aEntry))
@@ -195,12 +198,19 @@
theLastModified = archive_entry_mtime(aEntry);
}
//check if it is encoded
+
+switch(archive_entry_filetype(aEntry))
+{
+ case AE_IFDIR: theEntryType = directory; break;
+ default: theEntryType = regular; break;
+}
}
void
ArchiveFunction::ArchiveEntry::setValues(zorba::Item aEntry)
{
theEntryPath = aEntry.getStringValue();
+
if (aEntry.isNode())
{
Item lAttr;
@@ -212,7 +222,15 @@
Item lAttrName;
lAttr.getNodeName(lAttrName);
-if (lAttrName.getLocalName() == last-modified)
+if(lAttrName.getLocalName() == type)
+{
+ String filetype = lAttr.getStringValue();
+ if(filetype == directory)
+ {
+theEntryType = directory;
+ }
+}
+else if (lAttrName.getLocalName() == last-modified)
{
ArchiveModule::parseDateTimeItem(lAttr, theLastModified);
}
@@ -548,12 +566,15 @@
for (size_t i = 0; i aEntries.size(); ++i)
{
- if (!aFiles-next(lFile))
+ if(aEntries[i].getEntryType() == ArchiveEntry::regular)
{
-std::ostringstream lMsg;
-lMsg number of entries ( aEntries.size()
- ) doesn't match number of content arguments ( i );
-throwError(ARCH0001, lMsg.str().c_str());
+if (!aFiles-next(lFile))
+{
+ std::ostringstream lMsg;
+ lMsg number of entries ( aEntries.size()
+ ) doesn't match number of content arguments ( i );
+ throwError(ARCH0001, lMsg.str().c_str());
+}
}
const ArchiveEntry lEntry = aEntries[i];
@@ -578,14 +599,19 @@
std::istream* lStream;
bool lDeleteStream;
uint64_t lFileSize;
-
- lDeleteStream = getStream(
- aEntry, aFile, lStream, lFileSize);
archive_entry_set_pathname(theEntry, aEntry.getEntryPath().c_str());
archive_entry_set_mtime(theEntry, aEntry.getLastModified(), 0);
// TODO: modified to allow the creation of empty directories
- archive_entry_set_filetype(theEntry, AE_IFREG);
+ if(aEntry.getEntryType() == ArchiveEntry::regular){
+archive_entry_set_filetype(theEntry, AE_IFREG);
+lDeleteStream = getStream(
+ aEntry, aFile, lStream, lFileSize);
+ } else {
+archive_entry_set_filetype(theEntry, AE_IFDIR);
+lDeleteStream = false;
+lFileSize = 0;
+ }
// TODO: specifies the permits of a file
archive_entry_set_perm(theEntry, 0644
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1040558 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1040558 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1040558/+merge/120956 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1040558/+merge/120956 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
Review: Approve Looks fine. -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/120438 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/undo-10989 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/undo-10989 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/undo-10989/+merge/120245 -- https://code.launchpad.net/~zorba-coders/zorba/undo-10989/+merge/120245 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/1025564 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/1025564 into lp:zorba. Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1025564 in Zorba: Deprecate -f argument to zorbacmd https://bugs.launchpad.net/zorba/+bug/1025564 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/120024 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/120024 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/add-archive-module into lp:zorba
Review: Approve Seems OK. -- https://code.launchpad.net/~zorba-coders/zorba/add-archive-module/+merge/116086 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
