[Zorba-coders] [Merge] lp:~zorba-coders/zorba/json-http-module into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 :
Votes: {'Approve': 2, 'Needs commit message': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579
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/json-http-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/json-http-module into lp:zorba has been updated. Commit Message changed to: Added JSON HTTP client module. Fixed initialization, error reporting and encoding bugs in the XML HTTP client. Reimplemented XML HTTP client on top of the JSON HTTP client module. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/54/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/json-http-module into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/http-client-based-on-json-http-client into lp:zorba/http-client-module
Review: Needs Information 1. Do we need to promote this to version 2.0 of the EXpath module? Isn't the public API exactly the same, as defined by EXpath? I understand the implementation is different, but I don't believe that's relevant for module versioning. 2. (Possibly the same question) Do we need to keep the old version of this module, what we're calling 1.0? Again, they have the same interface, so why would anyone care about importing one or the other? I agree, let us keep the same version. 3. FYI the XQDoc has a link to the scripting tutorial on http://www.zorba- xquery.com/ . That might even be a broken link now, but it should presumably be updated to http://www.zorba.io/ . 4. Also FYI, the example given (reading the Zorba blog RSS feed) almost certainly won't work, since (a) the URL is old and (b) our blog isn't working at the moment. Fixed, will be committed soon. Now that we have updated the core XML HTTP client in zorba to be based on the new core JSON HTTP module there is some code replication here and in the XML HTTP client to convert XML requests into JSON requests and JSON responses in XML responses (600 xquery lines) + error catching and rethrowing. 1) Ignore the replication, (the XML http client will be removed at some point?) 2) Create a non-advertised module for doing the conversions? Are there some best-practices in Zorba? 3) Base the module on the XML http client which is based on the JSON http client (4 conversions for one request) Personally I would go with 1 or 2. Thanks -- https://code.launchpad.net/~zorba-coders/zorba/http-client-based-on-json-http-client/+merge/169578 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/json-http-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/json-http-module into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 -- https://code.launchpad.net/~zorba-coders/zorba/json-http-module/+merge/169579 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/http-client-based-on-json-http-client into lp:zorba/http-client-module
Is the code replication exact, or very nearly exact? If so I think I'd go with option 2. (If it was only 50-100 lines of code I'd pick option 1, but 600 lines seems like rather a lot.) I suspect that the XML http-client will be with us for quite some time. I agree that option 3, while clean, probably has too much conversion overhead. I'm not sure if there are any best-practices here for implementing #2. As far as I know, there's no real concept of a protected module. For now, just make it a new module in the core with the conversion functions public, and a big XQDoc comment stating that this module isn't intended to be used by anyone other than the two http-client modules and that we make no promises about maintaining the API or the module itself. -- https://code.launchpad.net/~zorba-coders/zorba/http-client-based-on-json-http-client/+merge/169578 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/use-dataguide into lp:zorba
I have tried some basic queries and there is a huge performance improvement. This is great. However, I detected a memory leak and have one question. - memory leak in translator.cpp:4823 I've fixed it. - In the following query, no dataguide seems to be pushed into the parser. Why? The count() function is marked with the %explores-json annotation, because pruning objects that reach the function will modify the returned result. That is why the dataguide is empty. -- -- https://code.launchpad.net/~zorba-coders/zorba/use-dataguide/+merge/176385 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/skip-items into lp:zorba
- In ZorbaCollectionIterator::initCollection lines 307 and 326, you eventually add skipCount twice. Something smells spooky here. Yes, it seems it was added twice. I've fixed it. I've also added the skip() function to the EvalIterator. -- -- https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 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/skip-items into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 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/skip-items into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 Stage TestZorbaUbuntu failed. 1 tests failed (8415 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/123/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 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/http-client-wrapper into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/http-client-wrapper into lp:zorba has been updated. Status: Needs review = Work in progress For more details, see: https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 -- https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 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/skip-items into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 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/http-client-based-on-json-http-client into lp:zorba/http-client-module
Depends on lp:~zorba-coders/zorba/http-client-wrapper -- https://code.launchpad.net/~zorba-coders/zorba/http-client-based-on-json-http-client/+merge/169578 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/http-client-wrapper into lp:zorba
To avoid replicating conversion code (600-700 lines) between the core XML http client and the Expath http client as discussed in: https://code.launchpad.net/~zorba-coders/zorba/http-client-based-on-json-http-client/+merge/169578 I introduced a wrapper module for doing all conversions. -- https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 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/http-client-wrapper into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 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/http-client-wrapper into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/57/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 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/skip-items into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 :
Votes: {'Needs Information': 1, 'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723
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/http-client-wrapper into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980
:
Votes: {'Pending': 2, 'Needs commit message': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980
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/skip-items into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/56/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723 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/expath-http-on-json-http into lp:zorba/http-client-module
Federico Cavalieri has proposed merging
lp:~zorba-coders/zorba/expath-http-on-json-http into
lp:zorba/http-client-module.
Requested reviews:
Cezar Andrei (cezar-andrei)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996
--
https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996
Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module.
=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2011-07-26 10:42:50 +
+++ src/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,19 +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 org)
-ADD_SUBDIRECTORY(org)
-MESSAGE(STATUS End modules)
=== renamed file 'src/org/expath/ns/CMakeLists.txt' = 'src/CMakeLists.txt'
=== renamed file 'src/org/expath/ns/http-client.xq' = 'src/http-client.xq'
--- src/org/expath/ns/http-client.xq 2013-06-15 19:39:40 +
+++ src/http-client.xq 2013-07-25 16:52:28 +
@@ -30,22 +30,23 @@
: p
: In general, both functions take a description of the HTTP request to make
: as parameter, execute the request, and return a representation of the HTTP
- : response. For instance, in the following code snippet, we fetch the blog feed from Zorba:
+ : response. For instance, in the following code snippet, we fetch the Zorba
+ : home page:
: /p
- : pre class=ace-static ace-mode=xquery![CDATA[import module namespace http = http://expath.org/ns/http-client;;
+ : pre
+ : import module namespace http = http://expath.org/ns/http-client;;
:
: http:send-request(
- : http:request href=http://www.zorba-xquery.com/blog/feed; method=get /
+ : http:request href=http://zorba.io; method=get /
: )
- : ]]/pre
- : pYou can try this example a href=http://www.zorba-xquery.com/html/demo#GKnscDSYqVadJ+CQftvnRw+LUd0=;live/a./p
+ : /pre
:
: p
: The codehttp:send-request()/code functions are declared as sequential.
: Sequential functions are allowed to have side effects. For example, most probably,
: an HTTP POST request is a request that has side effects because it adds/changes
: a remote resource. Sequential functions are specified in the
- : a href=http://www.zorba-xquery.com/html/documentation/latest/zorba/scripting_tutorial;XQuery Scripting Extension/a.
+ : a href=http://www.zorba.io/documentation/latest/zorba/scripting_tutorial.html;XQuery Scripting Extension/a.
: In contrast, the http:read() functions are not declared as sequential -
: they are declared as nondeterministic though, which
: means that several calls may return different results.
@@ -97,7 +98,7 @@
: a href=http://expath.org/spec/http-client#d2e491;specification/a.
: /p
:
- : @author Markus Pilman
+ : @author Federico Cavalieri, Markus Pilman
: @see a href=http://www.w3.org/TR/xquery-3/#FunctionDeclns;XQuery 3.0: Function Declaration/a
: @library a href=http://curl.haxx.se/;cURL Library/a
: @project EXPath/EXPath HTTP Client
@@ -105,7 +106,7 @@
:)
module namespace http = http://expath.org/ns/http-client;;
-import module namespace zorba-http = http://www.zorba-xquery.com/modules/http-client;;
+import module namespace http-wrapper = http://zorba.io/modules/http-client-wrapper;;
import module namespace err = http://expath.org/ns/error;;
import module namespace tidy=http://www.zorba-xquery.com/modules/converters/html;;
@@ -152,7 +153,7 @@
try
{
{
- variable $result := zorba-http:send-request($request, $href, $bodies);
+ variable $result := http-wrapper:http-sequential-request($request, $href, $bodies);
http:tidy-result($result, fn:data($request/@override-media-type))
}
} catch XPTY0004 {
@@ -223,4 +224,4 @@
tidy:parse($body)
else
$body
-};
+};
=== removed directory 'src/org'
=== removed file 'src/org/CMakeLists.txt'
--- src/org/CMakeLists.txt 2011-10-06 08:18:34 +
+++ src/org/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,14 +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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath-http-on-json-http into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/expath-http-on-json-http into lp:zorba/http-client-module has been updated. Status: Needs review = Work in progress For more details, see: https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996 -- https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/expath-http-on-json-http into lp:zorba/http-client-module
Federico Cavalieri has proposed merging
lp:~zorba-coders/zorba/expath-http-on-json-http into
lp:zorba/http-client-module.
Requested reviews:
Cezar Andrei (cezar-andrei)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996
--
https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996
Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module.
=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2011-07-26 10:42:50 +
+++ src/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,19 +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 org)
-ADD_SUBDIRECTORY(org)
-MESSAGE(STATUS End modules)
=== renamed file 'src/org/expath/ns/CMakeLists.txt' = 'src/CMakeLists.txt'
=== renamed file 'src/org/expath/ns/http-client.xq' = 'src/http-client.xq'
--- src/org/expath/ns/http-client.xq 2013-06-15 19:39:40 +
+++ src/http-client.xq 2013-07-25 16:52:28 +
@@ -30,22 +30,23 @@
: p
: In general, both functions take a description of the HTTP request to make
: as parameter, execute the request, and return a representation of the HTTP
- : response. For instance, in the following code snippet, we fetch the blog feed from Zorba:
+ : response. For instance, in the following code snippet, we fetch the Zorba
+ : home page:
: /p
- : pre class=ace-static ace-mode=xquery![CDATA[import module namespace http = http://expath.org/ns/http-client;;
+ : pre
+ : import module namespace http = http://expath.org/ns/http-client;;
:
: http:send-request(
- : http:request href=http://www.zorba-xquery.com/blog/feed; method=get /
+ : http:request href=http://zorba.io; method=get /
: )
- : ]]/pre
- : pYou can try this example a href=http://www.zorba-xquery.com/html/demo#GKnscDSYqVadJ+CQftvnRw+LUd0=;live/a./p
+ : /pre
:
: p
: The codehttp:send-request()/code functions are declared as sequential.
: Sequential functions are allowed to have side effects. For example, most probably,
: an HTTP POST request is a request that has side effects because it adds/changes
: a remote resource. Sequential functions are specified in the
- : a href=http://www.zorba-xquery.com/html/documentation/latest/zorba/scripting_tutorial;XQuery Scripting Extension/a.
+ : a href=http://www.zorba.io/documentation/latest/zorba/scripting_tutorial.html;XQuery Scripting Extension/a.
: In contrast, the http:read() functions are not declared as sequential -
: they are declared as nondeterministic though, which
: means that several calls may return different results.
@@ -97,7 +98,7 @@
: a href=http://expath.org/spec/http-client#d2e491;specification/a.
: /p
:
- : @author Markus Pilman
+ : @author Federico Cavalieri, Markus Pilman
: @see a href=http://www.w3.org/TR/xquery-3/#FunctionDeclns;XQuery 3.0: Function Declaration/a
: @library a href=http://curl.haxx.se/;cURL Library/a
: @project EXPath/EXPath HTTP Client
@@ -105,7 +106,7 @@
:)
module namespace http = http://expath.org/ns/http-client;;
-import module namespace zorba-http = http://www.zorba-xquery.com/modules/http-client;;
+import module namespace http-wrapper = http://zorba.io/modules/http-client-wrapper;;
import module namespace err = http://expath.org/ns/error;;
import module namespace tidy=http://www.zorba-xquery.com/modules/converters/html;;
@@ -152,7 +153,7 @@
try
{
{
- variable $result := zorba-http:send-request($request, $href, $bodies);
+ variable $result := http-wrapper:http-sequential-request($request, $href, $bodies);
http:tidy-result($result, fn:data($request/@override-media-type))
}
} catch XPTY0004 {
@@ -223,4 +224,4 @@
tidy:parse($body)
else
$body
-};
+};
=== removed directory 'src/org'
=== removed file 'src/org/CMakeLists.txt'
--- src/org/CMakeLists.txt 2011-10-06 08:18:34 +
+++ src/org/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,14 +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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/expath-http-on-json-http into lp:zorba/http-client-module
Ready for review. This is updates the expath http client to be based on the wrapper module introduced in lp:~zorba-coders/zorba/http-client-wrapper The comments of the previous branch (outdated links, wrapper conversion module) have been addressed. -- https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/http-client-wrapper into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/http-client-wrapper into lp:zorba has been updated. Commit Message changed to: HTTP client request/response conversion in a separate module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 -- https://code.launchpad.net/~zorba-coders/zorba/http-client-wrapper/+merge/176980 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/expath-http-on-json-http into lp:zorba/http-client-module
Apparently the Expath HTTP Client queries 2 and 3 fail on the zorba demo website (http://zorbawebsite2.my28msec.com/html/demo) This does not seem to depend on the latest http client merge which apparently is not there yet. Is this a known problem? -- https://code.launchpad.net/~zorba-coders/zorba/expath-http-on-json-http/+merge/176996 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-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/use-dataguide into lp:zorba
Review: Needs Information - In the following query, no dataguide seems to be pushed into the parser. Why? The count() function is marked with the %explores-json annotation, because pruning objects that reach the function will modify the returned result. That is why the dataguide is empty. I don't understand why. In my example it wouldn't. The count functions could count the number of empty objects or objects that contain only the STREET field. -- https://code.launchpad.net/~zorba-coders/zorba/use-dataguide/+merge/176385 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/jdbc-mariadb-driver
into lp:zorba/jdbc-module.
Commit message:
Additional expected result when using MariaDB JDBC driver.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036
--
https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== added file 'test/ExpQueryResults/04-set-null-mariadb.xml.res'
--- test/ExpQueryResults/04-set-null-mariadb.xml.res 1970-01-01 00:00:00 +
+++ test/ExpQueryResults/04-set-null-mariadb.xml.res 2013-07-25 20:29:27 +
@@ -0,0 +1,1 @@
+{ columns : [ { name : String.class, type : String } ] }
\ No newline at end of file
=== added file 'test/Queries/04-set-null.spec'
--- test/Queries/04-set-null.spec 1970-01-01 00:00:00 +
+++ test/Queries/04-set-null.spec 2013-07-25 20:29:27 +
@@ -0,0 +1,3 @@
+Result: $RBKT_SRC_DIR/ExpQueryResults/04-set-null.xml.res
+# Additional expected result when using MariaDB JDBC driver
+Result: $RBKT_SRC_DIR/ExpQueryResults/04-set-null-mariadb.xml.res
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module has been updated. Commit Message changed to: Additional expected result when using MariaDB JDBC driver. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036
:
Votes: {'Approve': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/jdbc-mariadb-driver into lp:zorba/jdbc-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/58/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/jdbc-mariadb-driver/+merge/177036 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/skip-items into lp:zorba
Review: Needs Fixing
The following query crashes:
xquery version 3.0;
import module namespace ddl =
http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl;;
import module namespace dml =
http://www.zorba-xquery.com/modules/store/dynamic/collections/dml;;
import module namespace e = http://www.zorba-xquery.com/modules/reflection;;
ddl:create(xs:QName(ddl:test2),(center1/,oldlast/));
subsequence(e:eval(dml:collection(xs:QName('ddl:test2'))), 2, 1)
--
https://code.launchpad.net/~zorba-coders/zorba/skip-items/+merge/174723
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/use-dataguide into lp:zorba
Review: Needs Information I have no idea what problem this MP is supposed to solve; nor do I know what a data guide is. -- https://code.launchpad.net/~zorba-coders/zorba/use-dataguide/+merge/176385 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-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
