diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e5721d922..15b341cb7 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -37,6 +37,9 @@ import time from io import BytesIO from subprocess import Popen, PIPE from PIL import Image +from ooopy.OOoPy import OOoPy +from ooopy.Transformer import Transformer as OOTransformer +import ooopy.Transforms as OOTransforms from django import forms from django.apps import apps @@ -3221,20 +3224,16 @@ class DocumentTemplate(models.Model): output = open(output_name, 'wb') output.write(result) output_name = main_output_name + suffix - # TODO: merge docs - return the last for now - from ooopy.OOoPy import OOoPy - from ooopy.Transformer import Transformer - import ooopy.Transforms as Transforms o = OOoPy(infile=names[0], outfile=output_name) if len(names) > 1: - t = Transformer( + t = OOTransformer( o.mimetype, - Transforms.get_meta(o.mimetype), - Transforms.Concatenate(*(names[1:])), - Transforms.renumber_all(o.mimetype), - Transforms.set_meta(o.mimetype), - Transforms.Fix_OOo_Tag(), - Transforms.Manifest_Append() + OOTransforms.get_meta(o.mimetype), + OOTransforms.Concatenate(*(names[1:])), + OOTransforms.renumber_all(o.mimetype), + OOTransforms.set_meta(o.mimetype), + OOTransforms.Fix_OOo_Tag(), + OOTransforms.Manifest_Append() ) t.transform (o) o.close() |