# HG changeset patch
# User Björn Ricks <bjoern.ricks@intevation.de>
# Date 1415792431 -3600
# Node ID ae377f7eed182d22fa683cc11d551bf7c1c52fc9
# Parent  2dacbe7fb7f942129fe3acd976984e35c2e9cf96
Add ErrorResponse class for resposes after an error has occured during the merge

diff -r 2dacbe7fb7f9 -r ae377f7eed18 odfcast/convert.py
--- a/odfcast/convert.py	Wed Nov 12 12:38:37 2014 +0100
+++ b/odfcast/convert.py	Wed Nov 12 12:40:31 2014 +0100
@@ -94,6 +94,16 @@
             html_error_code=500)
 
 
+class MergeErrorResponse(ErrorResponse):
+
+    MERGE_ERROR_CODE = 300
+
+    def __init__(self, details, error_code=MERGE_ERROR_CODE):
+        super(MergeErrorResponse, self).__init__(
+            title="MergeError", error_code=error_code, details=details,
+            html_error_code=500)
+
+
 class ConvertView(MethodView):
 
     def __init__(self, pyuno_driver_name="", hostname="localhost", port=2001):