From 5bd73ea1f021e5a7ba1b633c7db5f74a7c6df291 Mon Sep 17 00:00:00 2001
From: Anael Lorimier <anael.lorimier@xcg-consulting.fr>
Date: Fri, 7 Nov 2014 10:23:53 +0100
Subject: [PATCH] Call new methods from py3o.template to easily jsonify our
 datastruct

---
 py3o_report.py | 90 +++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 48 deletions(-)

diff --git a/py3o_report.py b/py3o_report.py
index 76f075f2..5429263a 100644
--- a/py3o_report.py
+++ b/py3o_report.py
@@ -9,15 +9,17 @@ from openerp.osv.osv import except_osv
 from py3o.template import Template
 
 import requests
+from collections import defaultdict
+import json
 
 
 class py3o_report(report_sxw):
-#     def __init__(self, name, table):
-#         super(py3o_report, self).__init__(name, table)
+    # def __init__(self, name, table):
+    #         super(py3o_report, self).__init__(name, table)
 
     def get_values(self, cr, uid, ids, data, context):
-        ''' Override this function to customize the dictionary given to the
-        py3o.template renderer. '''
+        """ Override this function to customize the dictionary given to the
+        py3o.template renderer. """
 
         return {
             'lang': self.get_lang(cr, uid, context),
@@ -36,8 +38,8 @@ class py3o_report(report_sxw):
         return lang_obj.browse(cr, uid, lang, context=context)
 
     def format_date(self, date, values):
-        ''' Return a date formatted according to the language extracted from
-        the "values" argument (which should be the result of get_values). '''
+        """ Return a date formatted according to the language extracted from
+        the "values" argument (which should be the result of get_values). """
         return date.strftime(values['lang'].date_format)
 
     def create(self, cr, uid, ids, data, context=None):
@@ -45,8 +47,8 @@ class py3o_report(report_sxw):
         pool = pooler.get_pool(cr.dbname)
         report_xml_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = report_xml_obj.search(cr, uid,
-            [('report_name', '=', self.name[7:])],  # Ignore "report."
-            context=context)
+                                               [('report_name', '=', self.name[7:])], # Ignore "report."
+                                               context=context)
         if not report_xml_ids:
             return super(py3o_report, self).create(cr, uid, ids, data,
                                                    context=context)
@@ -58,48 +60,40 @@ class py3o_report(report_sxw):
         filetype = report_xml.py3o_fusion_filetype
 
         # py3o.template operates on filenames so create temporary files.
-        with NamedTemporaryFile(suffix='.odt', prefix='py3o-template-') as \
-            in_temp, \
-            NamedTemporaryFile(suffix='.odt', prefix='py3o-report-') as \
-            out_temp:
+        with NamedTemporaryFile(suffix='.odt', prefix='py3o-template-') as in_temp:
 
             in_temp.write(b64decode(template.py3o_template_data))
             in_temp.flush()
-
-            template = Template(in_temp.name, out_temp.name)
-
-            template.render(self.get_values(cr, uid, ids, data, context))
-
-            out_temp.seek(0)
-            
-            if filetype.human_ext != 'odt':
-                # Now we ask fusion server to convert our template
-                fusion_server_obj = pool['py3o.server']
-                fusion_server_id = fusion_server_obj.search(
-                    cr, uid, [], context=context
-                )[0]
-                fusion_server = fusion_server_obj.browse(
-                    cr, uid, fusion_server_id, context=context
-                )
-                files = {
-                    'tmpl_file': out_temp,
-                }
-                fields = {
-                    "targetformat": filetype.fusion_ext,
-                    "datadict": "{}",
-                    "image_mapping": "{}",
-                    "skipfusion": True,
-                }
-                r = requests.post(fusion_server.url, data=fields, files=files)
-                chunk_size = 1024
-                with NamedTemporaryFile(
+            in_temp.seek(0)
+
+            template = Template(in_temp.name, None)
+
+            user_instruction_mapping = template.get_user_instructions_mapping()
+            values = user_instruction_mapping.jsonify(
+                self.get_values(cr, uid, ids, data, context)
+            )
+
+            fusion_server_obj = pool['py3o.server']
+            fusion_server_id = fusion_server_obj.search(
+                cr, uid, [], context=context
+            )[0]
+            fusion_server = fusion_server_obj.browse(
+                cr, uid, fusion_server_id, context=context
+            )
+            files = {
+                'tmpl_file': in_temp,
+            }
+            fields = {
+                "targetformat": filetype.fusion_ext,
+                "datadict": values,
+                "image_mapping": "{}",
+            }
+            r = requests.post(fusion_server.url, data=fields, files=files)
+            chunk_size = 1024
+            with NamedTemporaryFile(
                     suffix=filetype.human_ext,
                     prefix='py3o-template-') as fd:
-                    for chunk in r.iter_content(chunk_size):
-                        fd.write(chunk)
-                    fd.seek(0)
-                    return fd.read(), filetype.human_ext
-
-            return out_temp.read(), 'odt'
-
-        return False, False
+                for chunk in r.iter_content(chunk_size):
+                    fd.write(chunk)
+                fd.seek(0)
+                return fd.read(), filetype.human_ext