Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clearer code comments, add logging.

pull/21/head
Jairo Llopis 2015-06-15 12:36:01 +02:00
parent 2c2cf1904c
commit 3d5a0cb68d
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
report_xml/models.py
View File

@ -16,10 +16,14 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from lxml import etree from lxml import etree
from openerp import api, fields, models from openerp import api, fields, models
_logger = logging.getLogger(__name__)
class ReportAction(models.Model): class ReportAction(models.Model):
_inherit = "ir.actions.report.xml" _inherit = "ir.actions.report.xml"
@ -93,15 +97,29 @@ class XSDCheckedReport(models.AbstractModel):
If ``context`` contains a dict called ``docargs``, it will be used as If ``context`` contains a dict called ``docargs``, it will be used as
the Qweb context. The special key ``docs`` will be added to ``docargs`` the Qweb context. The special key ``docs`` will be added to ``docargs``
automatically if missing. automatically if missing.
"""
# Qweb context
docargs = self.env.context.get("docargs", dict()) docargs = self.env.context.get("docargs", dict())
xsd = etree.XMLSchema(etree.XML(self.xsd()))
if "docs" not in docargs: if "docs" not in docargs:
docargs["docs"] = (self.env[self.env.context["active_model"]] docargs["docs"] = (self.env[self.env.context["active_model"]]
.browse(self.env.context["active_ids"])) .browse(self.env.context["active_ids"]))
# Load XSD
xsd = etree.XML(self.xsd())
_logger.debug("XSD schema contents: %s", etree.tostring(xsd))
xsd = etree.XMLSchema(xsd)
parser = etree.XMLParser(schema=xsd) parser = etree.XMLParser(schema=xsd)
# Generate XML report
result = (self.env["report"] result = (self.env["report"]
.render(self._name[len("report."):], docargs) .render(self._name[len("report."):], docargs)
.strip()) .strip())
# Validate XML with XSD
try:
etree.fromstring(result, parser) etree.fromstring(result, parser)
except Exception as error:
_logger.error(result)
raise error
return result return result