Mercurial > odfcast > odfcast
comparison odfcast/convert.py @ 85:c018570c1a2d 1.2
Ignore existing Bookmarks when merging documemts
| author | Frank Koormann <frank.koormann@intevation.de> |
|---|---|
| date | Thu, 02 Apr 2015 15:45:55 +0200 |
| parents | 3492c79d83c8 |
| children | 4f45ebecb057 |
comparison
equal
deleted
inserted
replaced
| 84:3492c79d83c8 | 85:c018570c1a2d |
|---|---|
| 212 key=lambda x: x[0].lower()): | 212 key=lambda x: x[0].lower()): |
| 213 ffiles.extend(value) | 213 ffiles.extend(value) |
| 214 | 214 |
| 215 for ffile in ffiles: | 215 for ffile in ffiles: |
| 216 try: | 216 try: |
| 217 merger.append(ffile) | 217 merger.append(ffile, import_bookmarks=False) |
| 218 except Exception, e: | 218 except Exception, e: |
| 219 log.exception("Error merging file %s" % ffile) | 219 log.exception("Error merging file %s" % ffile) |
| 220 if self.is_ignore_file_errors(): | 220 if self.is_ignore_file_errors(): |
| 221 continue | 221 continue |
| 222 else: | 222 else: |
| 255 "Upload file missing", error_code=101, | 255 "Upload file missing", error_code=101, |
| 256 details="Please upload a file for conversion", | 256 details="Please upload a file for conversion", |
| 257 html_error_code=400) | 257 html_error_code=400) |
| 258 | 258 |
| 259 try: | 259 try: |
| 260 merger.append(ffile) | 260 merger.append(ffile, import_bookmarks=False) |
| 261 except Exception, e: | 261 except Exception, e: |
| 262 log.exception("Error merging file %s" % ffile) | 262 log.exception("Error merging file %s" % ffile) |
| 263 return MergeErrorResponse(details=str(e)) | 263 return MergeErrorResponse(details=str(e)) |
| 264 | 264 |
| 265 merger.close() | 265 merger.close() |