Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_987830 into lp:zorba
The module files should contain syntactically valid XQuery code. The formal semantics spec you cite is not concerned with syntax, and not everything described there has a coresponding syntactic construct. The none type is one example from the formal semantics that cannot be expressed syntactically. To see what types can be expressed syntactically, you have to look here: http://www.w3.org/TR/xquery-30/#id-sequencetype-syntax -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_987830/+merge/103370 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/fix_bug_987830 into lp:zorba
> "empty" and "none" are not valid sequence types. We should try that are > modules are at least parsable by other engines as well, so we should use valid > sequence types.; For "empty" use empty-sequence(). http://www.w3.org/TR/xquery-semantics/#sec_content_models >From this I understand that: - The type empty matches the empty sequence. - The type none matches no values. >There is not a valid sequence type for "none", but I did not see it used >anywhere. Do you plan to > use it? where? The type none is the static type for [7.2.9 The fn:error function]. > This also means that the code in translator.cpp should be removed. So where should http://www.w3.org/TR/xquery-semantics/#sec_content_models be implemented then? Thanks for the help. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_987830/+merge/103370 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Validation queue job temp-csx-schema-2012-04-26T20-17-19.67Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/fix_bug_987830 into lp:zorba
Review: Needs Fixing "empty" and "none" are not valid sequence types. We should try that are modules are at least parsable by other engines as well, so we should use valid sequence types.; For "empty" use empty-sequence(). There is not a valid sequence type for "none", but I did not see it used anywhere. Do you plan to use it? where? This also means that the code in translator.cpp should be removed. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_987830/+merge/103370 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/temp-csx-schema into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/temp-csx-schema-2012-04-26T20-17-19.67Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-csx-schema into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/temp-csx-schema into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/temp-csx-schema/+merge/96035 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 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/feature-ft_module into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job feature-ft_module-2012-04-26T17-42-44.771Z is finished. The final status was: 9 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 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/feature-ft_module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-ft_module-2012-04-26T17-42-44.771Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Commit Message changed to: 1. Added a new full-text module. 2. Fixed semi-broken Thesaurus API. 3. Now supporting many more languages for tokenization including Chinese. 4. Many other full-text improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 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:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module
The proposal to merge lp:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103586 -- https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103586 Your team Zorba Coders is requested to review the proposed merge of lp:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-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:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module
Diogo Simões has proposed merging lp:~diogo-simoes89/zorba/DC-documentation
into lp:zorba/data-cleaning-module.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103728
Addition of return types in functions signatures:
Applied in conversion, consolidation and set-similarity modules.
--
https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103728
Your team Zorba Coders is requested to review the proposed merge of
lp:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module.
=== modified file 'src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq'
--- src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq 2011-08-01 11:26:53 +
+++ src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq 2012-04-26 16:22:56 +
@@ -50,7 +50,7 @@
: @return The most frequent node in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-frequent.xq
:)
-declare function con:most-frequent ( $s ) {
+declare function con:most-frequent ( $s ) as xs:anyAtomicType{
(for $str in set:distinct($s) order by count($s[deep-equal(.,$str)]) descending return $str)[1]
};
@@ -67,7 +67,7 @@
: @return The least frequent node in the input sequence.
: @example test/Queries/data-cleaning/consolidation/leastfrequent_1.xq
:)
-declare function con:least-frequent ( $s ) {
+declare function con:least-frequent ( $s ) as xs:anyAtomicType{
let $aux := for $str in set:distinct($s) order by count($s[deep-equal(.,$str)]) return $str
return if (count($aux) = 0) then () else ($aux[1])
};
@@ -242,7 +242,7 @@
: @return The node having the largest number of descending elements in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-elements.xq
:)
-declare function con:most-elements ( $s ) {
+declare function con:most-elements ( $s ) as element()*{
(for $str in set:distinct($s) order by count($str/descendant-or-self::element()) descending return $str)[1]
};
@@ -260,7 +260,7 @@
: @return The node having the largest number of descending attributes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-attributes.xq
:)
-declare function con:most-attributes ( $s ) {
+declare function con:most-attributes ( $s ) as element()*{
(for $str in set:distinct($s) order by count($str/descendant-or-self::*/attribute()) descending return $str)[1]
};
@@ -278,7 +278,7 @@
: @return The node having the largest number of descending nodes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-nodes.xq
:)
-declare function con:most-nodes ( $s ) {
+declare function con:most-nodes ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::node()) descending return $str)[1]
};
@@ -296,7 +296,7 @@
: @return The node having the smallest number of descending elements in the input sequence.
: @example test/Queries/data-cleaning/consolidation/least-elements.xq
:)
-declare function con:least-elements ( $s ) {
+declare function con:least-elements ( $s ) as element()*{
(for $str in set:distinct($s) order by count($str/descendant-or-self::element()) return $str)[1]
};
@@ -314,7 +314,7 @@
: @return The node having the smallest number of descending attributes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/least-attributes.xq
:)
-declare function con:least-attributes ( $s ) {
+declare function con:least-attributes ( $s ) as element()*{
(for $str in set:distinct($s) order by count($str/descendant-or-self::*/attribute()) return $str)[1]
};
@@ -332,7 +332,7 @@
: @return The node having the smallest number of descending nodes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/least-nodes.xq
:)
-declare function con:least-nodes ( $s ) {
+declare function con:least-nodes ( $s ) as element()*{
(for $str in set:distinct($s) order by count($str/descendant-or-self::node()) return $str)[1]
};
@@ -350,7 +350,7 @@
: @return The node having the largest number of distinct descending elements in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-distinct-elements.xq
:)
-declare function con:most-distinct-elements ( $s ) {
+declare function con:most-distinct-elements ( $s ) as element()*{
(for $str in set:distinct($s) order by count(set:distinct($str/descendant-or-self::element())) descending return $str)[1]
};
@@ -368,7 +368,7 @@
: @return The node having the largest number of distinct descending attributes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-distinct-attributes.xq
:)
-declare function con:most-distinct-attributes ( $s ) {
+declare function con:most-distinct-attributes ( $s ) as element()*{
(for $str in set:distinct($s) order by count(set:distinct($str/descendant-or-self::*/attribute())) descending retu
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-978254 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-978254 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
Validation queue job bug-978254-2012-04-26T14-29-41.911Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-978254-2012-04-26T14-29-41.911Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-978254 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-978254 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-978254 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700 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-978254 into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-978254 into
lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700
Fixed bug 978254 (QName comparison in item sequence chainer ignored namespaces
and took prefixes into account).
--
https://code.launchpad.net/~zorba-coders/zorba/bug-978254/+merge/103700
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/item_sequence_chainer.h'
--- src/api/item_sequence_chainer.h 2012-04-24 12:39:38 +
+++ src/api/item_sequence_chainer.h 2012-04-26 14:12:26 +
@@ -17,13 +17,15 @@
#ifndef ZORBA_ITERATOR_ITEM_SEQUENCE_CHAINER_H
#define ZORBA_ITERATOR_ITEM_SEQUENCE_CHAINER_H
+#include
+#include
+#include
+
#include
#include
#include
#include
#include
-#include
-#include
namespace zorba {
@@ -85,7 +87,18 @@
struct Comparator {
bool operator()(const Item& i1, const Item& i2) const
{
- return i1.getStringValue().compare(i2.getStringValue()) < 0;
+ assert(i1.getType().getLocalName() == "QName");
+ assert(i2.getType().getLocalName() == "QName");
+ if (i1.getNamespace().compare(i2.getNamespace()) < 0)
+ {
+ return true;
+ }
+ if (i1.getNamespace().compare(i2.getNamespace()) > 0)
+ {
+ return false;
+ }
+ // Namespaces are equal, comparing local names.
+ return (i1.getLocalName().compare(i2.getLocalName()) < 0);
}
};
--
Mailing list: https://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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job feature-ft_module-2012-04-26T13-44-25.114Z is finished. The final status was: Undetermined, probably an error - please email chill...@lambda.nu with the number of this job! Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-ft_module-2012-04-26T13-44-25.114Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job feature-ft_module-2012-04-26T13-32-05.014Z is finished. The final status was: Undetermined, probably an error - please email chill...@lambda.nu with the number of this job! Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-ft_module-2012-04-26T13-32-05.014Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103404 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:~nbrinza/zorba/parse-fragment into lp:zorba
I've resubmitted the proposal since it seems it got stuck. -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/103624 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:~nbrinza/zorba/parse-fragment into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/parse-fragment into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/103624
Small optimization in the serializer to avoid a repeated string comparison
--
https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/103624
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp 2012-04-24 12:39:38 +
+++ src/api/serialization/serializer.cpp 2012-04-26 07:56:21 +
@@ -100,7 +100,6 @@
}
}
-
////
// Default emitter //
@@ -194,7 +193,7 @@
unicode::code_point cp = utf8::next_char(temp);
// raise an error iff (1) the serialization format is XML 1.0 and (2) the given character is an invalid XML 1.0 character
- if (ser && ser->method == PARAMETER_VALUE_XML && ser->version == "1.0" && !xml::is_valid(cp))
+ if (ser && ser->method == PARAMETER_VALUE_XML && ser->version == PARAMETER_VALUE_VERSION_1_0 && !xml::is_valid(cp))
throw XQUERY_EXCEPTION( err::FOCH0001, ERROR_PARAMS( cp ) );
if (cp >= 0x1 && cp <= 0x10)
@@ -219,7 +218,7 @@
// raise an error iff (1) the serialization format is XML 1.0 and (2) the given character is an invalid XML 1.0 character
if (ser && ser->method == PARAMETER_VALUE_XML &&
-ser->version == "1.0" && !xml::is_valid(static_cast(*chars)))
+ser->version == PARAMETER_VALUE_VERSION_1_0 && !xml::is_valid(static_cast(*chars)))
throw XQUERY_EXCEPTION(
err::XQST0090,
ERROR_PARAMS( static_cast( *chars ), xml::v1_0 )
@@ -431,7 +430,7 @@
}
else if (item->getNodeKind() == store::StoreConsts::attributeNode)
{
-throw XQUERY_EXCEPTION(err::SENR0001,
+throw XQUERY_EXCEPTION(err::SENR0001,
ERROR_PARAMS(item->getStringValue(), ZED(AttributeNode)));
}
else
@@ -858,7 +857,7 @@
emitter::emit_declaration();
if (ser->omit_xml_declaration == PARAMETER_VALUE_NO) {
-tr << "version;
+tr << "version_string;
switch (ser->encoding) {
case PARAMETER_VALUE_UTF_8:
case PARAMETER_VALUE_UTF_16:
@@ -1218,7 +1217,7 @@
// an element written as or in an XSLT stylesheet MUST
// be output as .
if (is_html_empty_content_model_element(item) &&
-ztd::equals(ser->version, "4.0", 3))
+ser->version == PARAMETER_VALUE_VERSION_4_0)
tr << ">";
else
tr << "/>";
@@ -2004,7 +2003,8 @@
undeclare_prefixes = PARAMETER_VALUE_NO;
- version = "1.0";
+ version = PARAMETER_VALUE_VERSION_1_0;
+ version_string = "1.0";
version_has_default_value = true;
indent = PARAMETER_VALUE_NO;
@@ -2119,8 +2119,18 @@
}
else if (!strcmp(aName, "version"))
{
-version = aValue;
+version_string = aValue;
version_has_default_value = false;
+if (version_string == "1.0")
+ version = PARAMETER_VALUE_VERSION_1_0;
+else if (version_string == "1.1")
+ version = PARAMETER_VALUE_VERSION_1_1;
+else if (version_string == "4.0")
+ version = PARAMETER_VALUE_VERSION_4_0;
+else if (version_string == "4.01")
+ version = PARAMETER_VALUE_VERSION_4_01;
+else
+ version = PARAMETER_VALUE_VERSION_OTHER;
}
else if (!strcmp(aName, "doctype-system"))
{
@@ -2156,51 +2166,52 @@
void
serializer::validate_parameters(void)
{
- if (method == PARAMETER_VALUE_XML || method == PARAMETER_VALUE_XHTML)
+ if (method == PARAMETER_VALUE_XML || method == PARAMETER_VALUE_XHTML)
{
// XML-only validation
-if (method == PARAMETER_VALUE_XML)
+if (method == PARAMETER_VALUE_XML)
{
- if (version != "1.0" && version != "1.1")
+ if (version != PARAMETER_VALUE_VERSION_1_0 && version != PARAMETER_VALUE_VERSION_1_1)
throw XQUERY_EXCEPTION(
err::SESU0013, ERROR_PARAMS( version, "XML", "\"1.0\", \"1.1\"" )
);
}
// XHTML-only validation
-if (method == PARAMETER_VALUE_XHTML)
+if (method == PARAMETER_VALUE_XHTML)
{
}
// XML and XHTML validation
-if (omit_xml_declaration == PARAMETER_VALUE_YES)
+if (omit_xml_declaration == PARAMETER_VALUE_YES)
{
if (standalone != PARAMETER_VALUE_OMIT)
throw XQUERY_EXCEPTION(
err::SEPM0009, ERROR_PARAMS( ZED( SEPM0009_NotOmit ) )
);
- if (version != "1.0" && !doctype_system.empty())
+ if (version != PARAMETER_VALUE_VERSION_1_0 && !doctype_system.empty())
throw XQUERY_EXCEPTION(
err::SEPM0009, ERROR_PARAMS( ZED( SEPM0009_Not10 ) )
);
}
-if (undeclare_prefixes == PARAMETER_VALUE_YES &&
