Merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba

[Cezar Andrei]

Fixes how error XQDY0027 is constructed.

Fixes how error XQDY0027 is constructed.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-01-25T22-23-00.553Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug867068-fixErrorXQDY0027-2013-01-25T22-23-00.553Z is
  finished. The final status was:

  3 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Paul J. Lucas (paul-lucas)]

invalid serialization parameters element name must be "serialization parameters"

That needs some reworking (some punctuation or something).

review: Needs Fixing

[Cezar Andrei (cezar-andrei)]

Fix for Paul's comment is in.

[Paul J. Lucas (paul-lucas)]

It's still wrong. It ought to be something like:

"$2": invalid serialization parameters; element name must be "serialization-parameters"

"$2": invalid namespace for the "serialization-parameters" element; must be "http://www.w3.org/2010/xslt-xquery-serialization"

You can't join two sentences together with a comma; see http://en.wikipedia.org/wiki/Comma_splice

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-01-29T19-40-48.099Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug867068-fixErrorXQDY0027-2013-01-29T19-40-48.099Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Needs Fixing, 1 Pending.

[Paul J. Lucas (paul-lucas)]

I don't like the use of the RAISE_ERROR macro. (This is something Marcos added.) It only obfuscates the "throw" statement. It's slightly less typing, but, in this case, I prefer clarity over conciseness. That said, I'll still approve it.

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-02-01T22-08-49.879Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug867068-fixErrorXQDY0027-2013-02-01T22-08-49.879Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-02-05T04-23-27.931Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug867068-fixErrorXQDY0027-2013-02-05T04-23-27.931Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-02-06T20-58-35.305Z/log.html

[Cezar Andrei (cezar-andrei)]

Added entry in ChangeLog.

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug867068-fixErrorXQDY0027-2013-02-06T20-58-35.305Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog

[lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027]

11203. By Cezar Andrei <email address hidden> on 2013-02-08

Merge from trunk, fix conflict in ChangeLog.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-02-08T22-18-57.923Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug867068-fixErrorXQDY0027-2013-02-08T22-18-57.923Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-02-08 18:31:22 +0000
+++ ChangeLog	2013-02-08 22:17:27 +0000
@@ -23,6 +23,7 @@
   * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
   * Fixed bug #1099535  (xml:parse endless loop)
   * Fixed bug #866958  (Parsing error not explicit enough)
+  * Fixed bug #867068: (Incorrect usage of XQDY0027)
 
 
 version 2.8

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2013-02-08 01:58:24 +0000
+++ src/diagnostics/diagnostic_en.xml	2013-02-08 22:17:27 +0000
@@ -863,6 +863,14 @@
        either \c valid or \c notKnown if validation mode is \c lax.
       </comment>
       <value>"$1": unexpected validity property${: 2}</value>
+
+      <entry key="SerializationElementName_2">
+        <value>"$2": invalid serialization parameters; element name must be "serialization-parameters"</value>
+      </entry>
+
+      <entry key="SerializationElementNs_2">
+        <value>"$2": invalid namespace for the "serialization-parameters" element; must be "http://www.w3.org/2010/xslt-xquery-serialization"</value>
+      </entry>
     </diagnostic>
 
     <diagnostic code="XQDY0041">
@@ -2465,19 +2473,19 @@
     <diagnostic code="ZDDY0037" name="COLLECTION_APPEND_BAD_EDIT">
       <value>"$1": illegal edit in append-only collection</value>
     </diagnostic>
-     
+
     <diagnostic code="ZDDY0038" name="COLLECTION_QUEUE_BAD_EDIT">
       <value>"$1": illegal edit from queue collection</value>
     </diagnostic>
-     
+
     <diagnostic code="ZDDY0039" name="NON_ROOT_NODE_EDIT">
       <value>attempt to edit non-root node in collection "$1"</value>
     </diagnostic>
-     
+
     <diagnostic code="ZDDY0040" name="INCONSISTENT_EDIT">
       <value>attempt to edit an item with a template of a different kind (for example an object with a node).</value>
     </diagnostic>
-     
+
     <diagnostic code="ZDST0001" name="COLLECTION_ALREADY_DECLARED">
       <value>"$1": collection already declared</value>
     </diagnostic>

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2013-02-08 01:58:24 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2013-02-08 22:17:27 +0000
@@ -918,6 +918,8 @@
   { "~XPTY0004_NoTypePromote_23", "$2 can not be promoted to type $3" },
   { "~XPTY0117_NodeCast", "Cannot cast node to xs:QName" },
   { "~XPTY0117_NotationParam_23", "$2 can not be promoted to parameter type xs:NOTATION of function $3()" },
+  { "~XQDY0027_SerializationElementName_2", "\"$2\": invalid serialization parameters; element name must be \"serialization-parameters\"" },
+  { "~XQDY0027_SerializationElementNs_2", "\"$2\": invalid namespace for the \"serialization-parameters\" element; must be \"http://www.w3.org/2010/xslt-xquery-serialization\"" },
   { "~XQST0046_BadHexDigit_3", "'$3': invalid hexedecimal digit" },
   { "~XQST0059_SpecificationMessage", "\"$2\": target namespace not found for schema/module${ \"3\"}${: 4}" },
   { "~XQST0059_XercesMessage", "$2,$3: error in schema${ with System ID \"4\"}${ with Public ID \"5\"}${: 6}" },

=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
--- src/diagnostics/pregenerated/dict_zed_keys.h	2013-02-08 01:58:24 +0000
+++ src/diagnostics/pregenerated/dict_zed_keys.h	2013-02-08 22:17:27 +0000
@@ -57,6 +57,8 @@
 #define ZED_XPDY0002_VariableHasNoValue_2 "~XPDY0002_VariableHasNoValue_2"
 #define ZED_XPDY0002_VariableUndeclared_2 "~XPDY0002_VariableUndeclared_2"
 #define ZED_XPDY0002_ContextUndeclared_2 "~XPDY0002_ContextUndeclared_2"
+#define ZED_XQDY0027_SerializationElementName_2 "~XQDY0027_SerializationElementName_2"
+#define ZED_XQDY0027_SerializationElementNs_2 "~XQDY0027_SerializationElementNs_2"
 #define ZED_FTST0009_BadStopWordsLang "~FTST0009_BadStopWordsLang"
 #define ZED_FTST0009_BadStemmerLang "~FTST0009_BadStemmerLang"
 #define ZED_FTST0009_BadThesaurusLang "~FTST0009_BadThesaurusLang"

=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2012-10-08 12:09:36 +0000
+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2013-02-08 22:17:27 +0000
@@ -26,6 +26,9 @@
 #include "runtime/api/plan_iterator_wrapper.h"
 #include "compiler/api/compilercb.h"
 
+#include "diagnostics/assert.h"
+#include "diagnostics/util_macros.h"
+
 #include "store/api/store.h"
 #include "store/api/item.h"
 #include "store/api/item_factory.h"
@@ -74,9 +77,9 @@
       is = iss.get();
     }
 
-    
+
     baseUri = theSctx->get_base_uri();
-    
+
 
     try {
       store::LoadProperties loadProps;
@@ -117,12 +120,10 @@
   if (lElemName->getLocalName() != "serialization-parameters")
   {
     ztd::string_builder lSb;
-    lSb << "the serialization parameters element must have the name \"serialization parameters\". "
-      << "\"" << lElemName->getLocalName() << "\" was found";
-    throw XQUERY_EXCEPTION(
-      err::XQDY0027,
-      ERROR_PARAMS(lSb.str()),
-      ERROR_LOC( aLoc ));
+    lSb << lElemName->getLocalName();
+
+    RAISE_ERROR(err::XQDY0027, aLoc,
+      ERROR_PARAMS(ZED(XQDY0027_SerializationElementName_2), lSb));
   }
 
   // the provided element must be in the correct namespace otherwise
@@ -131,20 +132,12 @@
   if (lElemName->getNamespace() != "http://www.w3.org/2010/xslt-xquery-serialization")
   {
     ztd::string_builder lSb;
-    zstring lFoundNs("No");
+    zstring lFoundNs("");
     if (lElemName->getNamespace().size() > 0)
-    {
-      lFoundNs = "<";
       lFoundNs += lElemName->getNamespace();
-      lFoundNs += ">";
-    }
 
-    lSb << "the serialization-parameters element must be in the <http://www.w3.org/2010/xslt-xquery-serialization> namespace. "
-      << lFoundNs << " namespace was found";
-    throw XQUERY_EXCEPTION(
-      err::XQDY0027,
-      ERROR_PARAMS(lSb .str()),
-      ERROR_LOC( aLoc ));
+    RAISE_ERROR(err::XQDY0027, aLoc,
+      ERROR_PARAMS(ZED(XQDY0027_SerializationElementNs_2), lFoundNs));
   }
 
 #ifndef ZORBA_NO_XMLSCHEMA