Adding RNG validation on XML
bzr revid: fp@tinyerp.com-3d3a6488d247cc74a3da10a7ce1683d8d9db4ad0
This commit is contained in:
Fabien Pinckaers
parent
a5ea68f171
commit
2a05c94b88
|
|
@ -219,7 +219,7 @@ def load_module_graph(cr, graph, status=None, **kwargs):
|
|||
if new_query:
|
||||
cr.execute(new_query)
|
||||
else:
|
||||
tools.convert_xml_import(cr, m, tools.file_open(opj(m, filename)).read(), idref, mode=mode, **kwargs)
|
||||
tools.convert_xml_import(cr, m, tools.file_open(opj(m, filename)), idref, mode=mode, **kwargs)
|
||||
if hasattr(package, 'demo') or (package_demo and package_state != 'installed'):
|
||||
status['progress'] = (float(statusi)+0.75)/len(graph)
|
||||
for xml in package.datas.get('demo_xml', []):
|
||||
|
|
@ -228,7 +228,7 @@ def load_module_graph(cr, graph, status=None, **kwargs):
|
|||
if ext == '.csv':
|
||||
tools.convert_csv_import(cr, m, os.path.basename(xml), tools.file_open(opj(m, xml)).read(), idref, noupdate=True)
|
||||
else:
|
||||
tools.convert_xml_import(cr, m, tools.file_open(opj(m, xml)).read(), idref, noupdate=True, **kwargs)
|
||||
tools.convert_xml_import(cr, m, tools.file_open(opj(m, xml)), idref, noupdate=True, **kwargs)
|
||||
cr.execute('update ir_module_module set demo=%s where name=%s', (True, package.name))
|
||||
package_todo.append(package.name)
|
||||
cr.execute("update ir_module_module set state='installed' where state in ('to upgrade', 'to install') and name=%s", (package.name,))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<terp>
|
||||
<data noupdate="1">
|
||||
|
||||
<record id="view_menu" model="ir.ui.view">
|
||||
<field name="name">ir.ui.menu.tree</field>
|
||||
<field name="model">ir.ui.menu</field>
|
||||
|
|
@ -1505,4 +1504,4 @@
|
|||
<field name="company_id" ref="main_company"/>
|
||||
</record>
|
||||
</data>
|
||||
</terp>
|
||||
</terp>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,210 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<rng:grammar xmlns:rng="http://relaxng.org/ns/structure/1.0">
|
||||
<rng:define name="any">
|
||||
<rng:element>
|
||||
<rng:anyName/>
|
||||
<rng:zeroOrMore>
|
||||
<rng:choice>
|
||||
<rng:attribute>
|
||||
<rng:anyName/>
|
||||
</rng:attribute>
|
||||
<rng:text/>
|
||||
<rng:ref name="any"/>
|
||||
</rng:choice>
|
||||
</rng:zeroOrMore>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="value">
|
||||
<rng:element name="value">
|
||||
<rng:optional><rng:attribute name="model" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="search" /></rng:optional>
|
||||
<rng:optional>
|
||||
<rng:attribute name="eval"/>
|
||||
</rng:optional>
|
||||
<rng:empty />
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="function">
|
||||
<rng:element name="function">
|
||||
<rng:attribute name="model" />
|
||||
<rng:attribute name="name" />
|
||||
<rng:optional><rng:attribute name="id" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="eval" /></rng:optional>
|
||||
<rng:choice>
|
||||
<rng:empty />
|
||||
<rng:oneOrMore>
|
||||
<rng:choice>
|
||||
<rng:ref name="value" />
|
||||
<rng:ref name="function" />
|
||||
</rng:choice>
|
||||
</rng:oneOrMore>
|
||||
</rng:choice>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="assert">
|
||||
<rng:element name="assert">
|
||||
<rng:attribute name="model" />
|
||||
<rng:optional><rng:attribute name="search" /> </rng:optional>
|
||||
<rng:optional><rng:attribute name="string" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="id" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="severity" /></rng:optional>
|
||||
<rng:oneOrMore>
|
||||
<rng:element name="test">
|
||||
<rng:attribute name="expr"/>
|
||||
<rng:choice>
|
||||
<rng:text />
|
||||
<rng:empty />
|
||||
</rng:choice>
|
||||
</rng:element>
|
||||
</rng:oneOrMore>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="workflow">
|
||||
<rng:element name="workflow">
|
||||
<rng:attribute name="model" />
|
||||
<rng:optional><rng:attribute name="ref" /></rng:optional>
|
||||
<rng:attribute name="action"/>
|
||||
<rng:optional><rng:attribute name="uid"/></rng:optional>
|
||||
<rng:choice>
|
||||
<rng:empty/>
|
||||
<rng:ref name="value"/>
|
||||
</rng:choice>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="wizard">
|
||||
<rng:element name="wizard">
|
||||
<rng:attribute name="name"/>
|
||||
<rng:attribute name="id" />
|
||||
<rng:optional><rng:attribute name="menu" /></rng:optional>
|
||||
<rng:attribute name="model" />
|
||||
<rng:attribute name="string" />
|
||||
<rng:optional><rng:attribute name="keyword" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="multi" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="client_action_multi" /></rng:optional>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="report">
|
||||
<rng:element name="report">
|
||||
<rng:optional><rng:attribute name="id"/></rng:optional>
|
||||
<rng:attribute name="string"/>
|
||||
<rng:attribute name="model"/>
|
||||
<rng:attribute name="name"/>
|
||||
<rng:optional><rng:attribute name="multi"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="menu"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="keyword"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="rml"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="xml"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="xsl"/></rng:optional>
|
||||
<rng:optional> <rng:attribute name="auto" /> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="header" /> </rng:optional>
|
||||
<rng:empty />
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="field">
|
||||
<rng:element name="field">
|
||||
<rng:attribute name="name" />
|
||||
<rng:optional><rng:attribute name="type"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="ref"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="eval"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="search"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="model"/></rng:optional>
|
||||
<rng:optional><rng:attribute name="use"/></rng:optional>
|
||||
<rng:oneOrMore>
|
||||
<rng:choice>
|
||||
<rng:ref name="any"/>
|
||||
<rng:text/>
|
||||
</rng:choice>
|
||||
</rng:oneOrMore>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
|
||||
<rng:define name="record">
|
||||
<rng:element name="record">
|
||||
<rng:optional><rng:attribute name="id" /> </rng:optional>
|
||||
<rng:attribute name="model" />
|
||||
<rng:optional><rng:attribute name="forcecreate" /></rng:optional>
|
||||
<rng:oneOrMore>
|
||||
<rng:ref name="field" />
|
||||
</rng:oneOrMore>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="ir_set">
|
||||
<rng:element name="ir_set">
|
||||
<rng:oneOrMore>
|
||||
<rng:ref name="field" />
|
||||
</rng:oneOrMore>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="menuitem">
|
||||
<rng:element name="menuitem">
|
||||
<!-- L'identifiant devrait être obligatoire -->
|
||||
<rng:optional> <rng:attribute name="id" /></rng:optional>
|
||||
<!-- Attention le nom peut disparaitre uniquement si le parent est présent -->
|
||||
<rng:optional> <rng:attribute name="name"/></rng:optional>
|
||||
<rng:optional> <rng:attribute name="parent"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="icon"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="action"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="string"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="sequence"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="groups"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="type"/> </rng:optional>
|
||||
<rng:empty />
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="act_window">
|
||||
<rng:element name="act_window">
|
||||
<rng:attribute name="id" />
|
||||
<rng:attribute name="name" />
|
||||
<rng:attribute name="res_model" />
|
||||
<rng:optional><rng:attribute name="domain" /> </rng:optional>
|
||||
<rng:optional><rng:attribute name="src_model" /></rng:optional>
|
||||
<rng:optional><rng:attribute name="context" /></rng:optional>
|
||||
<rng:optional> <rng:attribute name="view"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="view_id"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="view_type"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="view_mode"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="multi"/> </rng:optional>
|
||||
<rng:optional> <rng:attribute name="target"/> </rng:optional>
|
||||
<rng:empty />
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="data">
|
||||
<rng:element name="data">
|
||||
<rng:optional><rng:attribute name="noupdate" /></rng:optional>
|
||||
<rng:zeroOrMore>
|
||||
<rng:choice>
|
||||
<rng:text/>
|
||||
<rng:ref name="menuitem" />
|
||||
<rng:ref name="record" />
|
||||
<rng:ref name="wizard" />
|
||||
<rng:ref name="act_window" />
|
||||
<rng:ref name="assert" />
|
||||
<rng:ref name="report" />
|
||||
<rng:ref name="workflow" />
|
||||
<rng:ref name="function" />
|
||||
<rng:ref name="ir_set" />
|
||||
</rng:choice>
|
||||
</rng:zeroOrMore>
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:start>
|
||||
<rng:element name="terp">
|
||||
<rng:oneOrMore>
|
||||
<rng:ref name="data" />
|
||||
</rng:oneOrMore>
|
||||
</rng:element>
|
||||
</rng:start>
|
||||
</rng:grammar>
|
||||
|
|
@ -40,6 +40,8 @@ import netsvc
|
|||
from config import config
|
||||
import logging
|
||||
|
||||
from lxml import etree
|
||||
|
||||
|
||||
class ConvertError(Exception):
|
||||
def __init__(self, doc, orig_excpt):
|
||||
|
|
@ -739,7 +741,21 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
|
|||
#
|
||||
# xml import/export
|
||||
#
|
||||
def convert_xml_import(cr, module, xmlstr, idref=None, mode='init', noupdate = False, report=None):
|
||||
def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate = False, report=None):
|
||||
xmlstr = xmlfile.read()
|
||||
xmlfile.seek(0)
|
||||
relaxng_doc = etree.parse(file('import_xml.rng'))
|
||||
relaxng = etree.RelaxNG(relaxng_doc)
|
||||
|
||||
doc = etree.parse(xmlfile)
|
||||
try:
|
||||
relaxng.assert_(doc)
|
||||
except Exception, e:
|
||||
logger = netsvc.Logger()
|
||||
logger.notifyChannel('init', netsvc.LOG_ERROR, 'The XML file do not fit the required schema !')
|
||||
logger.notifyChannel('init', netsvc.LOG_ERROR, relaxng.error_log.last_error)
|
||||
raise
|
||||
|
||||
if not idref:
|
||||
idref={}
|
||||
if report is None:
|
||||
|
|
|
|||
Loading…
Reference in New Issue