From f7638c85ceb385eeb62ff5e46985253bbfd8a662 Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Wed, 1 Jul 2009 12:14:51 +0530
Subject: [PATCH] [FIX]:sxw and odt reports

bzr revid: nch@tinyerp.com-20090701064451-wlcwyeyqfeim7nqu
---
 bin/report/render/odt2odt/odt2odt.py |  2 --
 bin/report/report_sxw.py             | 50 +++++++++++++++++++---------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/bin/report/render/odt2odt/odt2odt.py b/bin/report/render/odt2odt/odt2odt.py
index d301e1270d9..65b6249c83e 100644
--- a/bin/report/render/odt2odt/odt2odt.py
+++ b/bin/report/render/odt2odt/odt2odt.py
@@ -23,8 +23,6 @@
 from report.render.rml2pdf import utils
 from lxml import etree
 import copy
-#sxw_parents = ['{http://openoffice.org/2000/table}table-row','{http://openoffice.org/2000/office}body','{http://openoffice.org/2000/text}section']
-#odt_parents = ['{urn:oasis:names:tc:opendocument:xmlns:office:1.0}body','{urn:oasis:names:tc:opendocument:xmlns:table:1.0}table-row','{urn:oasis:names:tc:opendocument:xmlns:text:1.0}section']
 
 class odt2odt(object):
     def __init__(self, odt, localcontext):
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 6d3aed5c38f..a4fe32a94a0 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -466,24 +466,42 @@ class report_sxw(report_rml, preprocess.report):
         rml_dom =  etree.XML(rml)
         body = rml_dom.getchildren()[-1]
         elements = []
-        key = rml_parser.localcontext['name_space']["text"]+'label'
-        key1 = rml_parser.localcontext['name_space']["text"]+'value'
+        key1 = rml_parser.localcontext['name_space']["text"]+"p"
+        key2 = rml_parser.localcontext['name_space']["text"]+"drop-down"
         for n in rml_dom.iterdescendants():
-            if n.tag == rml_parser.localcontext['name_space']["text"]+"p":
+            if n.tag == key1:
                 elements.append(n)
-        for pe in elements:
-            e = pe.findall(rml_parser.localcontext['name_space']["text"]+"drop-down")
-            for de in e:
-                pp=de.getparent()
-                for cnd in de.getchildren():
-                    if cnd.text or cnd.tail:
-                        if de.text or de.tail:
-                            pe.text = de.text or de.tail
-                        if pe.text:
-                            pe.text +=  cnd.text or cnd.tail
-                        else:
-                            pe.text =  cnd.text or cnd.tail
-                        pp.remove(de)
+        if report_type == 'odt':
+            for pe in elements:
+                e = pe.findall(key2)
+                for de in e:
+                    pp=de.getparent()
+                    if de.text or de.tail:
+                        pe.text = de.text or de.tail
+                    for cnd in de.getchildren():
+                        if cnd.text or cnd.tail:
+                            if pe.text:
+                                pe.text +=  cnd.text or cnd.tail
+                            else:
+                                pe.text =  cnd.text or cnd.tail
+                            pp.remove(de)
+        else:
+            for pe in elements:
+                e = pe.findall(key2)
+                for de in e:
+                    pp = de.getparent()
+                    if de.text or de.tail:
+                        pe.text = de.text or de.tail
+                    for cnd in de:
+                        text = cnd.get("{http://openoffice.org/2000/text}value",False)
+                        if text:
+                            if pe.text and text.startswith('[['):
+                                pe.text +=  text
+                            elif text.startswith('[['):
+                                pe.text =  text
+                            if de.getparent():
+                                pp.remove(de)
+
         rml_dom = self.preprocess_rml(rml_dom,report_type)
         create_doc = self.generators[report_type]
         odt = etree.tostring(create_doc(rml_dom, rml_parser.localcontext))