Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/XUDY00021 into lp:zorba
Markos, can you please review? -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/XUDY00021 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
Validation queue job XUDY00021-2012-02-14T23-26-10.892Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/XUDY00021-2012-02-14T23-26-10.892Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099 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/XUDY00021 into lp:zorba
Validation queue job XUDY00021-2012-02-14T22-54-59.23Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/XUDY00021 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/XUDY00021 into lp:zorba has been updated. Commit Message changed to: added error message for XUDY00021 in apply iterator For more details, see: https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100 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/XUDY00021 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/XUDY00021 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100
added error message for XUDY00021 in apply iterator
--
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2011-12-21 14:40:33 +
+++ src/diagnostics/diagnostic_en.xml 2012-02-14 22:59:19 +
@@ -1307,7 +1307,10 @@
[XQuery 1.0 and XPath 2.0 Data Model]. In this case, none of the updates
in the query are made effective.
- updates violate constraint
+ updates violate constraint${ 1}
+
+applied at $2
+
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2011-12-21 14:40:33 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2012-02-14 22:59:19 +
@@ -203,7 +203,7 @@
{ "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" },
{ "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" },
{ "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" },
- { "XUDY0021", "updates violate constraint" },
+ { "XUDY0021", "updates violate constraint${ 1}" },
{ "XUDY0023", "\"$1\": namespace binding conflicts with $2=$3" },
{ "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" },
{ "XUDY0027", "target expression is empty sequence" },
@@ -660,6 +660,7 @@
{ "~XQST0106_CONFLICTING", "conflicting" },
{ "~XQST0106_THE_SAME", "the same" },
{ "~XQueryVersionAtLeast10_2", "\"$2\": XQuery version must be at least 1.0" },
+ { "~XUDY0021_AppliedAt", "applied at $2" },
{ "~XUST0001_CONCAT", "comma expression with updating and non-updating branches" },
{ "~XUST0001_Generic", "updating expression illegal here" },
{ "~XUST0001_IF", "conditional expression with updating and non-updating branch" },
--
Mailing list: https://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/XUDY00021 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/XUDY00021-2012-02-14T22-54-59.23Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099 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/XUDY00021 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/XUDY00021 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099 -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099 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/XUDY00021 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099 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/XUDY00021 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/XUDY00021 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099
added error message for XUDY00021 in apply iterator. The error message was lost
during the work on generating the dictionary from XML files.
--
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099
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 2012-02-05 12:31:20 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2012-02-14 22:53:18 +
@@ -63,6 +63,8 @@
URI "http://www.zorba-xquery.com/modules/schema";)
DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1
URI "http://www.zorba-xquery.com/modules/string";)
+DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
+ URI "http://www.zorba-xquery.com/modules/uri";)
DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/xml";)
DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0
=== added file 'modules/com/zorba-xquery/www/modules/uri.xq'
--- modules/com/zorba-xquery/www/modules/uri.xq 1970-01-01 00:00:00 +
+++ modules/com/zorba-xquery/www/modules/uri.xq 2012-02-14 22:53:18 +
@@ -0,0 +1,90 @@
+xquery version "1.0";
+
+(:
+ : Copyright 2006-2012 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.
+:)
+
+(:~
+ : This module provides string related functions.
+ :
+ : @author Matthias Brantner
+ : @project XDM/atomic
+ :
+ :)
+module namespace uri = "http://www.zorba-xquery.com/modules/uri";;
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare option ver:module-version "1.0";
+
+
+(:~
+ : Percent-decodes (aka URL decoding) the given string.
+ :
+ : All percent encoded octets will be translated into their
+ : decoded UTF-8 representation.
+ :
+ : @param $s the string to decode
+ :
+ : @return the percent decoded string
+ :)
+declare function uri:decode($u as xs:string) as xs:string
+{
+ uri:decode($u, fn:false())
+};
+
+(:~
+ : Percent-decodes (aka URL decoding) the given string.
+ :
+ : All percent encoded octets will be translated into their
+ : decoded UTF-8 representation.
+ :
+ : If $decode-plus is specified all occurrences of the char '+'
+ : will be replaced with a space ' ' before the percent decoding
+ : happens.
+ :
+ : @param $s the string to decode
+ : @param $decode-plus whether '+' chars will be replaced with spaces
+ :
+ : @return the percent decoded string
+ :)
+declare function uri:decode(
+ $u as xs:string,
+ $decode-plus as xs:boolean) as xs:string
+{
+ uri:decode($u, $decode-plus, "UTF-8")
+};
+
+(:~
+ : Percent-decodes (aka URL decoding) the given string.
+ :
+ : All percent encoded octets will be translated into their
+ : decoded UTF-8 representation.
+ :
+ : If $decode-plus is specified all occurrences of the char '+'
+ : will be replaced with a space ' ' before the percent decoding
+ : happens.
+ :
+ : The $charset parameter specifies the source charset after precent
+ : decoding. It is used to convert the decoded string into UTF-8.
+ :
+ : @param $s the string to decode
+ : @param $decode-plus whether '+' chars will be replaced with spaces
+ : @param $charset the source charset of the string after percent decoding
+ :
+ : @return the percent decoded string
+ :)
+declare function uri:decode(
+ $s as xs:string,
+ $decode-plus as xs:boolean,
+ $charset as xs:string) as xs:string external;
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2012-02-05 12:31:20 +
+++ src/context/static_context.cpp 2012-02-14 22:53:18 +
@@ -361,6 +361,10 @@
"http://www.zorba-xquery.com/modules/string";;
const char*
+static_context::ZORBA_URI_FN_NS =
+"http://www.zorba-xquery.com/modules/uri";;
+
+const char*
static_context::ZORBA_FETCH_FN_NS =
"http://www.zorba-xquery.com/modules/fetch";;
@@ -436,6 +440,7 @@
ns == ZORBA_REFLECTION_FN_NS ||
ns == ZORBA_SCRIPTING_FN_NS ||
ns == ZORBA_STRING_FN_NS ||
+ns == ZORBA_URI_FN_NS ||
ns == ZORBA_FETCH_FN_NS ||
ns == ZORBA_NODE_FN_NS ||
ns == ZORBA_XML_FN_NS);
@@ -482,6 +487,7 @@
{
return (ns == ZORBA_MATH_FN_NS ||
ns == ZORBA_INT
