# HG changeset patch
# User Frank Koormann <frank.koormann@intevation.de>
# Date 1427982355 -7200
# Node ID c018570c1a2d300bededc7aea5a311bb822f4600
# Parent  3492c79d83c8051ae636e88a72fb25486dd58f45
Ignore existing Bookmarks when merging documemts

diff -r 3492c79d83c8 -r c018570c1a2d odfcast/convert.py
--- a/odfcast/convert.py	Thu Apr 02 15:45:01 2015 +0200
+++ b/odfcast/convert.py	Thu Apr 02 15:45:55 2015 +0200
@@ -214,7 +214,7 @@
 
         for ffile in ffiles:
             try:
-                merger.append(ffile)
+                merger.append(ffile, import_bookmarks=False)
             except Exception, e:
                 log.exception("Error merging file %s" % ffile)
                 if self.is_ignore_file_errors():
@@ -257,7 +257,7 @@
                 html_error_code=400)
 
         try:
-            merger.append(ffile)
+            merger.append(ffile, import_bookmarks=False)
         except Exception, e:
             log.exception("Error merging file %s" % ffile)
             return MergeErrorResponse(details=str(e))