zorba-coders team mailing list archive

[David Graf <david.graf@xxxxxxxxxx>]

David Graf has proposed merging lp:~zorba-coders/zorba/zorba-error_printer_in_api into lp:zorba.

Commit message:
Moving the error printer from zorbacmd into the api.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  William Candillon (wcandillon)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405

Moving the error printer from zorbacmd into the api.
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-error_printer_in_api/+merge/134405
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-11-07 11:48:14 +0000
+++ ChangeLog	2012-11-15 07:23:22 +0000
@@ -118,6 +118,7 @@
     http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
   * Added support for fragments to fn:path
   * Positional pagination support for collections
+  * Pagination by reference support for collections
   * http://www.zorba-xquery.com/modules/archive module for creating,
     reading, and updating various (compressed) archives (e.g. zip, tar.gz,
     or tar.bz2)

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2012-11-08 21:57:10 +0000
+++ bin/CMakeLists.txt	2012-11-15 07:23:22 +0000
@@ -44,7 +44,6 @@
 SET(SRCS
   zorbacmd.cpp
   zorbacmdproperties.cpp
-  error_printer.cpp
   util.cpp
   path_util.cpp
 )

=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp	2012-11-06 10:11:37 +0000
+++ bin/zorbacmd.cpp	2012-11-15 07:23:22 +0000
@@ -41,6 +41,7 @@
 #include <zorba/serialization_callback.h>
 #include <zorba/audit.h>
 #include <zorba/audit_scoped.h>
+#include <zorba/util/error_printer.h>
 
 #include <zorba/store_manager.h>
 
@@ -51,7 +52,6 @@
 #include <zorba/audit_scoped.h>
 #endif
 
-#include "error_printer.h"
 #include "util.h"
 #include "path_util.h"
 

=== renamed file 'bin/error_printer.h' => 'include/zorba/util/error_printer.h'
--- bin/error_printer.h	2012-09-19 21:16:15 +0000
+++ include/zorba/util/error_printer.h	2012-11-15 07:23:22 +0000
@@ -22,14 +22,22 @@
 
 class XQueryException;
 
-class ErrorPrinter {
+class ZORBA_DLL_PUBLIC ErrorPrinter {
 
   public:
 
+    /**
+     * Generates an error message out of an XQuery exception.
+     *
+     * @param aException The exception.
+     * @param aOut       Stream to which the error message is written to.
+     * @param aAsXml     Error message in XML format?
+     * @param aIndet     Error message indented?
+     */
     static std::ostream&
     print(
-      const XQueryException& lException,
-      std::ostream&          lOut,
+      const XQueryException& aException,
+      std::ostream&          aOut,
       bool                   aAsXml,
       bool                   aIndent);
 

=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt	2012-10-08 12:09:36 +0000
+++ src/api/CMakeLists.txt	2012-11-15 07:23:22 +0000
@@ -60,6 +60,7 @@
     streambuf.cpp
     transcode_streambuf.cpp
     uuid.cpp
+    error_printer.cpp
     )
 
 IF (NOT ZORBA_NO_FULL_TEXT)

=== renamed file 'bin/error_printer.cpp' => 'src/api/error_printer.cpp'
--- bin/error_printer.cpp	2012-09-19 21:16:15 +0000
+++ src/api/error_printer.cpp	2012-11-15 07:23:22 +0000
@@ -23,7 +23,7 @@
 #include <zorba/zorba_string.h>
 
 #include "zorba/util/uri.h"
-#include "error_printer.h"
+#include <zorba/util/error_printer.h>
 
 namespace zorba {