From 3723c2c43ddf73322b33e036b3693feef2d90f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 14 Sep 2010 10:04:26 +0200
Subject: [PATCH] Added action to get a word document out

---
 Avis.py        |  3 ++-
 AvisLegis.py   | 16 +++++++++++++---
 AvisSimplif.py | 12 ++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Avis.py b/Avis.py
index 51972c3..179eeea 100644
--- a/Avis.py
+++ b/Avis.py
@@ -41,7 +41,8 @@ class AvisOdt:
                                           fileType)
         renderer = appy.pod.renderer.Renderer(
            '%s/%s.odt' % (os.path.dirname(__file__), self.portal_type),
-           {'avis': self}, tempFileName)
+           {'avis': self}, tempFileName,
+           pythonWithUnoPath='/usr/bin/python2.6')
         renderer.run()
         # Tell the browser that the resulting page contains PDF
         response.setHeader('Content-type', 'application/%s' % fileType)
diff --git a/AvisLegis.py b/AvisLegis.py
index 11c9175..82eb0c7 100644
--- a/AvisLegis.py
+++ b/AvisLegis.py
@@ -3830,13 +3830,18 @@ class AvisLegis(BaseContent, AvisOdt):
     typeDescription = "AvisLegis"
     typeDescMsgId = 'description_edit_avis_simplif'
 
-    security.declarePublic('generateOdt')
-
     actions =  (
        {'action': "string:$object_url/generateOdt",
         'category': "document_actions",
         'id': 'asOdt',
-        'name': u'Générer en ODT',
+        'name': u'Générer en Open Document Format',
+        'permissions': ("View",),
+        'condition': 'python:1'
+       },
+       {'action': "string:$object_url/generateDoc",
+        'category': "document_actions",
+        'id': 'asDoc',
+        'name': u'Générer au format Microsoft Word',
         'permissions': ("View",),
         'condition': 'python:1'
        },
@@ -3859,6 +3864,11 @@ class AvisLegis(BaseContent, AvisOdt):
         '''Generates the ODT version of this advice.'''
         return self._generate(RESPONSE, 'odt')
 
+    security.declarePublic('generateDoc')
+    def generateDoc(self, RESPONSE):
+        '''Generates the Doc version of this advice.'''
+        return self._generate(RESPONSE, 'doc')
+
     security.declarePublic('getResponses')
     def getResponses(self):
         """Returns the predefined responses that are possible for each question.
diff --git a/AvisSimplif.py b/AvisSimplif.py
index 3784b29..5bc7116 100644
--- a/AvisSimplif.py
+++ b/AvisSimplif.py
@@ -812,6 +812,13 @@ class AvisSimplif(BaseContent, AvisOdt):
         'permissions': ("View",),
         'condition': 'python:1'
        },
+       {'action': "string:$object_url/generateDoc",
+        'category': "document_actions",
+        'id': 'asDoc',
+        'name': u'Générer au format Microsoft Word',
+        'permissions': ("View",),
+        'condition': 'python:1'
+       },
     )
 
     _at_rename_after_creation = True
@@ -822,6 +829,11 @@ class AvisSimplif(BaseContent, AvisOdt):
         '''Generates the ODT version of this advice.'''
         return self._generate(RESPONSE, 'odt')
 
+    security.declarePublic('generateDoc')
+    def generateDoc(self, RESPONSE):
+        '''Generates the Doc version of this advice.'''
+        return self._generate(RESPONSE, 'doc')
+
     security.declarePublic('getResponses')
     def getResponses(self):
         """Returns the predefined responses that are possible for each question.