Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread Ghislain Fourny
Hi Till,

Thanks! Perhaps a test on non-valid JSON would be nice?
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread Till Westmann
 Thanks! Perhaps a test on non-valid JSON would be nice?

Yes, they're in now.
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-error-code-fixes-2012-09-26T15-21-45.457Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread Ghislain Fourny
Review: Approve

Thanks!
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread Zorba Build Bot
Validation queue job jsoniq-error-code-fixes-2012-09-26T15-21-45.457Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-26 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Ghislain Fourny
Hi Till,

JNDY0040 does not exist in the spec. The error for parse-json if the supplied 
string is not valid JSON or if there is more than one object/array when it's 
forbidden, is JNDY0021.

Does it make sense?

-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Commit Message changed to:

s/JNTY0003/JNTY0024/
s/JSDY0020/JNTY0020/
s/JSDY0021/JNDY0021/
removed JSDY0040
doc fixes for jn:parse-json

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Description changed to:

s/JNTY0003/JNTY0024/
s/JSDY0020/JNTY0020/
s/JSDY0021/JNDY0021/
removed JSDY0040
doc fixes for jn:parse-json

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Till Westmann
 JNDY0040 does not exist in the spec. The error for parse-json if the supplied
 string is not valid JSON or if there is more than one object/array when it's
 forbidden, is JNDY0021.
 
 Does it make sense?

Yes, it does. I've removed JNDY0040 completely and replaced references to it 
with JNDY0021.
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-error-code-fixes-2012-09-25T17-45-49.152Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Zorba Build Bot
Validation queue job jsoniq-error-code-fixes-2012-09-25T17-45-49.152Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1. Got: 1 Approve, 1 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-25 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Till Westmann
Till Westmann has proposed merging 
lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba.

Commit message:
s/JNTY0003/JNTY0024/
s/JSDY0040/JNDY0040/
s/JSDY0020/JNTY0020/
s/JSDY0021/JNDY0021/
doc fixes for jn:parse-json


Requested reviews:
  Ghislain Fourny (gislenius)
  Till Westmann (tillw)
Related bugs:
  Bug #1055596 in Zorba: rename JNTY0003 to JNTY0024
  https://bugs.launchpad.net/zorba/+bug/1055596
  Bug #1055599 in Zorba: rename JSDY0020 to JNTY0020
  https://bugs.launchpad.net/zorba/+bug/1055599

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060

s/JNTY0003/JNTY0024/
s/JSDY0040/JNDY0040/
s/JSDY0020/JNTY0020/
s/JSDY0021/JNDY0021/
doc fixes for jn:parse-json

-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-09-20 18:20:33 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-09-24 17:23:49 +
@@ -851,13 +851,13 @@
 
 extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0023;
 
-extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0003;
-
-extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0040;
-
-extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0020;
-
-extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0021;
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0024;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNDY0040;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0020;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNDY0021;
 #endif
 
 } // namespace jerr

=== modified file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq	2012-09-21 18:25:49 +
+++ modules/org/jsoniq/www/functions.xq	2012-09-24 17:23:49 +
@@ -157,7 +157,7 @@
  :
  : @return A sequence of JSON Object or Array item.
  :
- : @error jerr:JSDY0040 if the given string is not valid JSON.
+ : @error jerr:JNDY0040 if the given string is not valid JSON.
  :)
 declare function jn:parse-json($j as xs:string?) as json-item()* external;
 
@@ -172,10 +172,10 @@
  :   lijsoniq-multiple-top-level-items: allow parsing of sequences of JSON Objects and Arrays (boolean; default: true)/li
  : /ul
  :
- : @error jerr:JSDY0040 if the given string is not valid JSON or 
- :   if jsoniq-multiple-top-level-items is false and there is additionalx
+ : @error jerr:JNDY0040 if the given string is not valid JSON or
+ :   if jsoniq-multiple-top-level-items is false and there is additional
  :   content after the first JSON Object or Array.
- : @error jerr:JSDY0041 if the value for the option
+ : @error jerr:JNTY0020 if the value for the option
  :   jsoniq-multiple-top-level-items is not of type xs:boolean.
  :
  : @return a sequence of JSON Object or Array item.

=== modified file 'modules/org/jsoniq/www/pregenerated/errors.xq'
--- modules/org/jsoniq/www/pregenerated/errors.xq	2012-09-20 19:24:53 +
+++ modules/org/jsoniq/www/pregenerated/errors.xq	2012-09-24 17:23:49 +
@@ -141,19 +141,19 @@
 (:~
  :objects or arrays don't have a string value
 :)
-declare variable $jerr:JNTY0003 as xs:QName := fn:QName($jerr:NS, jerr:JNTY0003);
+declare variable $jerr:JNTY0024 as xs:QName := fn:QName($jerr:NS, jerr:JNTY0024);
 
 (:~
  :parser errors raised by the JSONIQLoader
 :)
-declare variable $jerr:JSDY0040 as xs:QName := fn:QName($jerr:NS, jerr:JSDY0040);
+declare variable $jerr:JNDY0040 as xs:QName := fn:QName($jerr:NS, jerr:JNDY0040);
 
 (:~
  :parser error for invalid option type
 :)
-declare variable $jerr:JSDY0020 as xs:QName := fn:QName($jerr:NS, jerr:JSDY0020);
+declare variable $jerr:JNTY0020 as xs:QName := fn:QName($jerr:NS, jerr:JNTY0020);
 
 (:~
  :parser error raised by jn:parse-json
 :)
-declare variable $jerr:JSDY0021 as xs:QName := fn:QName($jerr:NS, jerr:JSDY0021);
\ No newline at end of file
+declare variable $jerr:JNDY0021 as xs:QName := fn:QName($jerr:NS, jerr:JNDY0021);
\ No newline at end of file

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-09-21 07:02:07 +
+++ src/diagnostics/diagnostic_en.xml	2012-09-24 17:23:49 +
@@ -2706,24 +2706,22 @@
 
 !--// JSONIQ ///--
 
-diagnostic code=JNTY0003 if=defined(ZORBA_WITH_JSON)
+diagnostic code=JNTY0024 if=defined(ZORBA_WITH_JSON)
   commentobjects or arrays don't have a string value/comment
-
   value$1 items do not have string value/value
 /diagnostic
 
-diagnostic code=JSDY0040 if=defined(ZORBA_WITH_JSON)
+diagnostic code=JNDY0040 if=defined(ZORBA_WITH_JSON)
   commentparser errors raised by the JSONIQLoader/comment
   value$1/value
 /diagnostic
 
-diagnostic code=JSDY0020 if=defined(ZORBA_WITH_JSON)
+diagnostic code=JNTY0020 if=defined(ZORBA_WITH_JSON)
   commentparser error for invalid option type/comment
   value$1: invalid option type for option $2 (expected 

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Till Westmann
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-error-code-fixes-2012-09-24T17-47-49.386Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Zorba Build Bot
Validation queue job jsoniq-error-code-fixes-2012-09-24T17-47-49.386Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1. Got: 1 Approve, 1 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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/jsoniq-error-code-fixes into lp:zorba

2012-09-24 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into 
lp:zorba has been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060
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