Zorba

Merge lp:~zorba-coders/zorba/bug-improve-ser-error into lp:zorba

  1. bug-improve-ser-error
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Merged at revision: 11562
Proposed branch: lp:~zorba-coders/zorba/bug-improve-ser-error
Merge into: lp:zorba
Diff against target: 11 lines (+1/-1)
1 file modified
src/api/serialization/serializer.cpp (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-improve-ser-error
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+176821@code.launchpad.net

Commit message

improve error message for invalid serialization version parameter

Description of the change

let $params :=
  <serialization-parameters xmlns="http://www.w3.org/2010/xslt-xquery-serialization">
    <version value="1.4"/>
    <method value="xml"/>
  </serialization-parameters>
return
  fn:serialize(<a/>, $params)

was changed from reporting

error [err:SESU0013]: "16": unsupported XML version; supported versions are: "1.0", "1.1";

to

error [err:SESU0013]: "1.4": unsupported XML version; supported versions are: "1.0", "1.1";

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) wrote :

Seems legit.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-improve-ser-error/+merge/176821

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/api/serialization/serializer.cpp'
2--- src/api/serialization/serializer.cpp 2013-07-11 14:04:33 +0000
3+++ src/api/serialization/serializer.cpp 2013-07-24 22:47:27 +0000
4@@ -2560,7 +2560,7 @@
5 {
6 if (version != PARAMETER_VALUE_VERSION_1_0 && version != PARAMETER_VALUE_VERSION_1_1)
7 throw XQUERY_EXCEPTION(
8- err::SESU0013, ERROR_PARAMS( version, "XML", "\"1.0\", \"1.1\"" )
9+ err::SESU0013, ERROR_PARAMS( version_string, "XML", "\"1.0\", \"1.1\"" )
10 );
11 }
12

Subscribers

People subscribed via source and target branches