zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1117952 into lp:zorba.

Commit message:
Removed #if 0's to enable new XML output code.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1117952 in Zorba: "Improve XML error output format"
  https://bugs.launchpad.net/zorba/+bug/1117952

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1117952/+merge/165484

Removed #if 0's to enable new XML output code.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1117952/+merge/165484
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-23 19:30:53 +0000
+++ ChangeLog	2013-05-23 20:39:29 +0000
@@ -13,6 +13,7 @@
     if the FOR clause is followed by an orderby or groupby clause.
 
 Bug Fixes/Other Changes:
+  * Fixed bug #1117952 (Improve XML error output format)
   * Fixed bug in hoisting through try-catch expr
   * Fixed bug #1103115 (Timezone units as hours are wrong)
   * Fixed implementation of fn:deep-equal according to latest W3C spec.

=== modified file 'src/diagnostics/xquery_exception.cpp'
--- src/diagnostics/xquery_exception.cpp	2013-02-26 04:12:43 +0000
+++ src/diagnostics/xquery_exception.cpp	2013-05-23 20:39:29 +0000
@@ -143,7 +143,6 @@
     if ( has_source() ) {
       o << indent << "<location";
       print_uri( o, source_uri() );
-#if 0
       o << " line-begin=\"" << source_line() << '"';
       if ( source_line_end() )
         o << " line-end=\"" << source_line_end() << '"';
@@ -151,15 +150,6 @@
         o << " column-begin=\"" << source_column() << '"';
       if ( source_column_end() )
         o << " column-end=\"" << source_column_end() << '"';
-#else
-      o << " lineStart=\"" << source_line() << '"';
-      if ( source_column() )
-        o << " columnStart=\"" << source_column() << '"';
-      if ( source_line_end() )
-        o << " lineEnd=\"" << source_line_end() << '"';
-      if ( source_column_end() )
-        o << " columnEnd=\"" << source_column_end() << '"';
-#endif
       o << "/>" << if_nl; // <location ...
 
       if ( has_data() ) {

=== modified file 'src/diagnostics/zorba_exception.cpp'
--- src/diagnostics/zorba_exception.cpp	2013-02-07 17:24:36 +0000
+++ src/diagnostics/zorba_exception.cpp	2013-05-23 20:39:29 +0000
@@ -128,15 +128,9 @@
 
   if ( as_xml ) {
     diagnostic::QName const &q = d.qname();
-#if 0
     o << indent << "<kind>" << d.kind() << "</kind>" << if_nl
       << indent << "<code namespace=\"" << q.ns()
       << "\" local-name=\"" << q.localname() << "\"/>"
-#else
-    o << indent << "<kind>" << d.kind() << ' '
-      << (is_warning( d ) ? "warning" : "error") << "</kind>" << if_nl
-      << indent << "<code>" << q << "</code>"
-#endif
       << if_nl;
   } else {
     //