stove/rougail
3
0
Fork 0
Code Issues 10 Pull requests 1 Projects Releases Wiki Activity

creole => rougail

Browse source
This commit is contained in:
Emmanuel Garette 2020-07-06 20:58:11 +02:00
parent ef5297a4e4
commit 38c95ea87a
316 changed files with 521 additions and 960 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/rougail/annotator.py
View file

@ -73,15 +73,15 @@ KEY_TYPE = {'variable': 'symlink',
'URLOption': 'web_address', 'URLOption': 'web_address',
'FilenameOption': 'filename'} 'FilenameOption': 'filename'}
TYPE_PARAM_CHECK = ('string', 'python', 'eole', 'variable') TYPE_PARAM_CHECK = ('string', 'python', 'variable')
TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'eole', 'variable') TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'variable')
TYPE_PARAM_FILL = ('string', 'number', 'variable') TYPE_PARAM_FILL = ('string', 'number', 'variable')
CONVERSION = {'number': int} CONVERSION = {'number': int}
ERASED_FAMILY_ACTION_ATTRIBUTES = ('index', 'action')
FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie' FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
VARIABLE_NAMESPACE = 'rougail'
class ServiceAnnotator: class ServiceAnnotator:
"""Manage service's object """Manage service's object
@ -341,7 +341,9 @@ class SpaceAnnotator(object):
for fam1 in fam.family: for fam1 in fam.family:
for variable in fam1.variable: for variable in fam1.variable:
if variable.type == 'symlink' and '.' not in variable.name: if variable.type == 'symlink' and '.' not in variable.name:
variable.opt = self.paths.get_variable_path(variable.opt, 'creole') variable.opt = self.paths.get_variable_path(variable.opt,
VARIABLE_NAMESPACE,
)
def convert_helps(self): def convert_helps(self):
# FIXME l'aide doit etre dans la variable! # FIXME l'aide doit etre dans la variable!
@ -529,7 +531,7 @@ class SpaceAnnotator(object):
(not has_value or is_follower) and variable.type != 'choice'): (not has_value or is_follower) and variable.type != 'choice'):
variable.mode = modes_level[0] variable.mode = modes_level[0]
if has_value: if has_value:
if not HIGH_COMPATIBILITY or (not path.startswith('creole.services.') \ if not HIGH_COMPATIBILITY or (not path.startswith(f'{VARIABLE_NAMESPACE}.services.') \
and path not in self.force_no_value and path not in self.force_not_mandatory): and path not in self.force_no_value and path not in self.force_not_mandatory):
variable.mandatory = True variable.mandatory = True
if variable.hidden is True: if variable.hidden is True:
@ -582,7 +584,8 @@ class SpaceAnnotator(object):
new_condition.param = [new_param] new_condition.param = [new_param]
new_target = self.objectspace.target() new_target = self.objectspace.target()
new_target.type = 'variable' new_target.type = 'variable'
if variables.name == 'creole': print(variables.name, VARIABLE_NAMESPACE)
if variables.name == VARIABLE_NAMESPACE:
path = variable.name path = variable.name
else: else:
path = variable.namespace + '.' + family.name + '.' + variable.name path = variable.namespace + '.' + family.name + '.' + variable.name
@ -1145,7 +1148,7 @@ class SpaceAnnotator(object):
del condition.param[idx] del condition.param[idx]
if condition.param == []: if condition.param == []:
for target in condition.target: for target in condition.target:
if target.name.startswith('creole.'): if target.name.startswith(f'{VARIABLE_NAMESPACE}.'):
name = target.name.split('.')[-1] name = target.name.split('.')[-1]
else: else:
name = target.name name = target.name
@ -1178,7 +1181,7 @@ class SpaceAnnotator(object):
for target_idx, target in enumerate(condition.target): for target_idx, target in enumerate(condition.target):
if target.name in force_remove_targets.get(condition.name, []): if target.name in force_remove_targets.get(condition.name, []):
remove_targets.append(target_idx) remove_targets.append(target_idx)
if target.name.startswith('creole.'): if target.name.startswith(f'{VARIABLE_NAMESPACE}.'):
name = target.name.split('.')[-1] name = target.name.split('.')[-1]
else: else:
name = target.name name = target.name
@ -1258,7 +1261,7 @@ class SpaceAnnotator(object):
else: else:
param = None param = None
for target in condition.target: for target in condition.target:
if target.name.startswith('creole.'): if target.name.startswith(f'{VARIABLE_NAMESPACE}.'):
name = target.name.split('.')[-1] name = target.name.split('.')[-1]
else: else:
name = target.name name = target.name

2
src/rougail/i18n.py
View file

@ -24,7 +24,7 @@ import sys
import locale import locale
# Application Name # Application Name
APP_NAME = 'creole' APP_NAME = 'rougail'
# Traduction dir # Traduction dir
APP_DIR = os.path.join(sys.prefix, 'share') APP_DIR = os.path.join(sys.prefix, 'share')

17
src/rougail/loader.py
View file

@ -1,4 +1,4 @@
"""creole loader """loader
flattened XML specific flattened XML specific
""" """
from os.path import join, isfile, isdir from os.path import join, isfile, isdir
@ -22,6 +22,7 @@ from .xmlreflector import HIGH_COMPATIBILITY
#from . import eosfunc #from . import eosfunc
from .objspace import CreoleObjSpace from .objspace import CreoleObjSpace
from .utils import normalize_family from .utils import normalize_family
from .annotator import VARIABLE_NAMESPACE
import imp import imp
@ -127,12 +128,12 @@ class PopulateTiramisuObjects(object):
if set(attr.itervalues()) == set(['True', 'False']): if set(attr.itervalues()) == set(['True', 'False']):
self.booleans.append(attr.name) self.booleans.append(attr.name)
def make_tiramisu_objects(self, xmlroot, creolefunc_file): def make_tiramisu_objects(self, xmlroot, eosfunc):
elt = Elt({'name': 'baseoption'}) elt = Elt({'name': 'baseoption'})
if creolefunc_file is None: if eosfunc is None:
self.eosfunc = None self.eosfunc = None
else: else:
self.eosfunc = imp.load_source('eosfunc', creolefunc_file) self.eosfunc = imp.load_source('eosfunc', eosfunc)
family = Family(elt, self.booleans, self.storage, self.eosfunc) family = Family(elt, self.booleans, self.storage, self.eosfunc)
self.storage.add('.', family) self.storage.add('.', family)
@ -148,12 +149,12 @@ class PopulateTiramisuObjects(object):
if elt == 'family': if elt == 'family':
xmlelts = [] xmlelts = []
actions = None actions = None
# `creole` family has to be loaded before any other family # VARIABLE_NAMESPACE family has to be loaded before any other family
# because `extra` family could use `creole` variables. # because `extra` family could use `VARIABLE_NAMESPACE` variables.
# `actions` family has to be loaded at the very end # `actions` family has to be loaded at the very end
# because it may use `creole` or `extra` variables # because it may use `VARIABLE_NAMESPACE` or `extra` variables
for xml in xmlelts_: for xml in xmlelts_:
if xml.attrib['name'] == 'creole': if xml.attrib['name'] == VARIABLE_NAMESPACE:
xmlelts.insert(0, xml) xmlelts.insert(0, xml)
elif xml.attrib['name'] == 'actions': elif xml.attrib['name'] == 'actions':
actions = xml actions = xml

132
src/rougail/objspace.py
View file

@ -4,11 +4,11 @@ as an input and outputs a human readable flatened XML
Sample usage:: Sample usage::
>>> from creole.objspace import CreoleObjSpace >>> from rougail.objspace import CreoleObjSpace
>>> eolobj = CreoleObjSpace('/usr/share/creole/creole.dtd') >>> eolobj = CreoleObjSpace('/usr/share/rougail/rougail.dtd')
>>> eolobj.create_or_populate_from_xml('creole', ['/usr/share/eole/creole/dicos']) >>> eolobj.create_or_populate_from_xml('rougail', ['/usr/share/eole/rougail/dicos'])
>>> eolobj.space_visitor() >>> eolobj.space_visitor()
>>> eolobj.save('/tmp/creole_flatened_output.xml') >>> eolobj.save('/tmp/rougail_flatened_output.xml')
The CreoleObjSpace The CreoleObjSpace
@ -28,7 +28,7 @@ from lxml.etree import Element, SubElement # pylint: disable=E0611
from .i18n import _ from .i18n import _
from .xmlreflector import XMLReflector, HIGH_COMPATIBILITY from .xmlreflector import XMLReflector, HIGH_COMPATIBILITY
from .annotator import ERASED_ATTRIBUTES, ServiceAnnotator, SpaceAnnotator from .annotator import ERASED_ATTRIBUTES, VARIABLE_NAMESPACE, ServiceAnnotator, SpaceAnnotator
from .utils import normalize_family from .utils import normalize_family
from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError
from .path import Path from .path import Path
@ -175,41 +175,41 @@ class CreoleObjSpace:
if HIGH_COMPATIBILITY and child.tag == 'value' and child.text == None: if HIGH_COMPATIBILITY and child.tag == 'value' and child.text == None:
# FIXME should not be here # FIXME should not be here
continue continue
# creole objects creation # variable objects creation
try: try:
creoleobj = self.generate_creoleobj(child, variableobj = self.generate_variableobj(child,
space, space,
namespace, namespace,
) )
except SpaceObjShallNotBeUpdated: except SpaceObjShallNotBeUpdated:
continue continue
self.set_text_to_obj(child, self.set_text_to_obj(child,
creoleobj, variableobj,
) )
self.set_xml_attributes_to_obj(child, self.set_xml_attributes_to_obj(child,
creoleobj, variableobj,
) )
self.creoleobj_tree_visitor(child, self.variableobj_tree_visitor(child,
creoleobj, variableobj,
namespace, namespace,
) )
self.fill_creoleobj_path_attribute(space, self.fill_variableobj_path_attribute(space,
child, child,
namespace, namespace,
document, document,
creoleobj, variableobj,
) )
self.add_to_tree_structure(creoleobj, self.add_to_tree_structure(variableobj,
space, space,
child, child,
) )
if list(child) != []: if list(child) != []:
self.xml_parse_document(child, self.xml_parse_document(child,
creoleobj, variableobj,
namespace, namespace,
) )
def generate_creoleobj(self, def generate_variableobj(self,
child, child,
space, space,
namespace, namespace,
@ -217,24 +217,24 @@ class CreoleObjSpace:
""" """
instanciates or creates Creole Object Subspace objects instanciates or creates Creole Object Subspace objects
""" """
creoleobj = getattr(self, child.tag)() variableobj = getattr(self, child.tag)()
if isinstance(creoleobj, self.Redefinable): if isinstance(variableobj, self.Redefinable):
creoleobj = self.create_or_update_redefinable_object(child.attrib, variableobj = self.create_or_update_redefinable_object(child.attrib,
space, space,
child, child,
namespace, namespace,
) )
elif isinstance(creoleobj, self.Atom) and child.tag in vars(space): elif isinstance(variableobj, self.Atom) and child.tag in vars(space):
# instanciates an object from the CreoleObjSpace's builtins types # instanciates an object from the CreoleObjSpace's builtins types
# example : child.tag = constraints -> a self.Constraints() object is created # example : child.tag = constraints -> a self.Constraints() object is created
# this Atom instance has to be a singleton here # this Atom instance has to be a singleton here
# we do not re-create it, we reuse it # we do not re-create it, we reuse it
creoleobj = getattr(space, child.tag) variableobj = getattr(space, child.tag)
self.create_tree_structure(space, self.create_tree_structure(space,
child, child,
creoleobj, variableobj,
) )
return creoleobj return variableobj
def create_or_update_redefinable_object(self, def create_or_update_redefinable_object(self,
subspace, subspace,
@ -296,7 +296,7 @@ class CreoleObjSpace:
def create_tree_structure(self, def create_tree_structure(self,
space, space,
child, child,
creoleobj, variableobj,
): # pylint: disable=R0201 ): # pylint: disable=R0201
""" """
Builds the tree structure of the object space here Builds the tree structure of the object space here
@ -310,17 +310,17 @@ class CreoleObjSpace:
space.value = list() space.value = list()
""" """
if child.tag not in vars(space): if child.tag not in vars(space):
if isinstance(creoleobj, self.Redefinable): if isinstance(variableobj, self.Redefinable):
setattr(space, child.tag, OrderedDict()) setattr(space, child.tag, OrderedDict())
elif isinstance(creoleobj, self.UnRedefinable): elif isinstance(variableobj, self.UnRedefinable):
setattr(space, child.tag, []) setattr(space, child.tag, [])
elif not isinstance(creoleobj, self.Atom): # pragma: no cover elif not isinstance(variableobj, self.Atom): # pragma: no cover
raise CreoleOperationError(_("Creole object {} " raise CreoleOperationError(_("Creole object {} "
"has a wrong type").format(type(creoleobj))) "has a wrong type").format(type(variableobj)))
def is_already_exists(self, name, space, child, namespace): def is_already_exists(self, name, space, child, namespace):
if isinstance(space, self.family): # pylint: disable=E1101 if isinstance(space, self.family): # pylint: disable=E1101
if namespace != 'creole': if namespace != VARIABLE_NAMESPACE:
name = space.path + '.' + name name = space.path + '.' + name
return self.paths.path_is_defined(name) return self.paths.path_is_defined(name)
if child.tag == 'family': if child.tag == 'family':
@ -353,14 +353,14 @@ class CreoleObjSpace:
else: else:
norm_name = name norm_name = name
return getattr(family, variable.tag)[norm_name] return getattr(family, variable.tag)[norm_name]
if namespace == 'creole': if namespace == VARIABLE_NAMESPACE:
path = name path = name
else: else:
path = family.path + '.' + name path = family.path + '.' + name
old_family_name = self.paths.get_variable_family_name(path) old_family_name = self.paths.get_variable_family_name(path)
if normalize_family(family.name) == old_family_name: if normalize_family(family.name) == old_family_name:
return getattr(family, variable.tag)[name] return getattr(family, variable.tag)[name]
old_family = self.space.variables['creole'].family[old_family_name] # pylint: disable=E1101 old_family = self.space.variables[VARIABLE_NAMESPACE].family[old_family_name] # pylint: disable=E1101
variable_obj = old_family.variable[name] variable_obj = old_family.variable[name]
del old_family.variable[name] del old_family.variable[name]
if 'variable' not in vars(family): if 'variable' not in vars(family):
@ -399,23 +399,23 @@ class CreoleObjSpace:
del condition.target[idx] del condition.target[idx]
def add_to_tree_structure(self, def add_to_tree_structure(self,
creoleobj, variableobj,
space, space,
child, child,
): # pylint: disable=R0201 ): # pylint: disable=R0201
if isinstance(creoleobj, self.Redefinable): if isinstance(variableobj, self.Redefinable):
name = creoleobj.name name = variableobj.name
if child.tag == 'family': if child.tag == 'family':
name = normalize_family(name) name = normalize_family(name)
getattr(space, child.tag)[name] = creoleobj getattr(space, child.tag)[name] = variableobj
elif isinstance(creoleobj, self.UnRedefinable): elif isinstance(variableobj, self.UnRedefinable):
getattr(space, child.tag).append(creoleobj) getattr(space, child.tag).append(variableobj)
else: else:
setattr(space, child.tag, creoleobj) setattr(space, child.tag, variableobj)
def set_text_to_obj(self, def set_text_to_obj(self,
child, child,
creoleobj, variableobj,
): ):
if child.text is None: if child.text is None:
text = None text = None
@ -423,20 +423,20 @@ class CreoleObjSpace:
text = child.text.strip() text = child.text.strip()
if text: if text:
if child.tag in self.forced_text_elts_as_name: if child.tag in self.forced_text_elts_as_name:
creoleobj.name = text variableobj.name = text
else: else:
creoleobj.text = text variableobj.text = text
def set_xml_attributes_to_obj(self, def set_xml_attributes_to_obj(self,
child, child,
creoleobj, variableobj,
): ):
redefine = self.convert_boolean(child.attrib.get('redefine', False)) redefine = self.convert_boolean(child.attrib.get('redefine', False))
has_value = hasattr(creoleobj, 'value') has_value = hasattr(variableobj, 'value')
if HIGH_COMPATIBILITY and has_value: if HIGH_COMPATIBILITY and has_value:
has_value = len(child) != 1 or child[0].text != None has_value = len(child) != 1 or child[0].text != None
if redefine is True and child.tag == 'variable' and has_value and len(child) != 0: if redefine is True and child.tag == 'variable' and has_value and len(child) != 0:
del creoleobj.value del variableobj.value
for attr, val in child.attrib.items(): for attr, val in child.attrib.items():
if redefine and attr in UNREDEFINABLE: if redefine and attr in UNREDEFINABLE:
# UNREDEFINABLE concerns only 'variable' node so we can fix name # UNREDEFINABLE concerns only 'variable' node so we can fix name
@ -445,9 +445,9 @@ class CreoleObjSpace:
raise CreoleDictConsistencyError(_(f'cannot redefine attribute {attr} for variable {name}')) raise CreoleDictConsistencyError(_(f'cannot redefine attribute {attr} for variable {name}'))
if attr in self.booleans_attributs: if attr in self.booleans_attributs:
val = self.convert_boolean(val) val = self.convert_boolean(val)
if not (attr == 'name' and getattr(creoleobj, 'name', None) != None): if not (attr == 'name' and getattr(variableobj, 'name', None) != None):
setattr(creoleobj, attr, val) setattr(variableobj, attr, val)
keys = list(vars(creoleobj).keys()) keys = list(vars(variableobj).keys())
for incompatible in INCOMPATIBLE_ATTRIBUTES: for incompatible in INCOMPATIBLE_ATTRIBUTES:
found = False found = False
for inc in incompatible: for inc in incompatible:
@ -456,33 +456,33 @@ class CreoleObjSpace:
raise CreoleDictConsistencyError(_('those attributes are incompatible {}').format(incompatible)) raise CreoleDictConsistencyError(_('those attributes are incompatible {}').format(incompatible))
found = True found = True
def creoleobj_tree_visitor(self, def variableobj_tree_visitor(self,
child, child,
creoleobj, variableobj,
namespace, namespace,
): ):
"""Creole object tree manipulations """Creole object tree manipulations
""" """
if child.tag == 'variable': if child.tag == 'variable':
if child.attrib.get('remove_check', False): if child.attrib.get('remove_check', False):
self.remove_check(creoleobj.name) self.remove_check(variableobj.name)
if child.attrib.get('remove_condition', False): if child.attrib.get('remove_condition', False):
self.remove_condition(creoleobj.name) self.remove_condition(variableobj.name)
if child.tag in ['fill', 'check']: if child.tag in ['fill', 'check']:
# if variable is a redefine in current dictionary # if variable is a redefine in current dictionary
# XXX not working with variable not in creole and in leader/followers # XXX not working with variable not in variable and in leader/followers
creoleobj.redefine = child.attrib['target'] in self.redefine_variables variableobj.redefine = child.attrib['target'] in self.redefine_variables
if not hasattr(creoleobj, 'index'): if not hasattr(variableobj, 'index'):
creoleobj.index = self.index variableobj.index = self.index
if child.tag in ['fill', 'condition', 'check', 'action']: if child.tag in ['fill', 'condition', 'check', 'action']:
creoleobj.namespace = namespace variableobj.namespace = namespace
def fill_creoleobj_path_attribute(self, def fill_variableobj_path_attribute(self,
space, space,
child, child,
namespace, namespace,
document, document,
creoleobj, variableobj,
): # pylint: disable=R0913 ): # pylint: disable=R0913
"""Fill self.paths attributes """Fill self.paths attributes
""" """
@ -494,9 +494,9 @@ class CreoleObjSpace:
child.attrib['name'], child.attrib['name'],
family_name, family_name,
document.attrib.get('dynamic') != None, document.attrib.get('dynamic') != None,
creoleobj) variableobj)
if child.attrib.get('redefine', 'False') == 'True': if child.attrib.get('redefine', 'False') == 'True':
if namespace == 'creole': if namespace == VARIABLE_NAMESPACE:
self.redefine_variables.append(child.attrib['name']) self.redefine_variables.append(child.attrib['name'])
else: else:
self.redefine_variables.append(namespace + '.' + family_name + '.' + self.redefine_variables.append(namespace + '.' + family_name + '.' +
@ -504,13 +504,13 @@ class CreoleObjSpace:
elif child.tag == 'family': elif child.tag == 'family':
family_name = normalize_family(child.attrib['name']) family_name = normalize_family(child.attrib['name'])
if namespace != 'creole': if namespace != VARIABLE_NAMESPACE:
family_name = namespace + '.' + family_name family_name = namespace + '.' + family_name
self.paths.add_family(namespace, self.paths.add_family(namespace,
family_name, family_name,
creoleobj, variableobj,
) )
creoleobj.path = self.paths.get_family_path(family_name, namespace) variableobj.path = self.paths.get_family_path(family_name, namespace)
def space_visitor(self, eosfunc_file): # pylint: disable=C0111 def space_visitor(self, eosfunc_file): # pylint: disable=C0111
ServiceAnnotator(self) ServiceAnnotator(self)
@ -592,7 +592,11 @@ class CreoleObjSpace:
if space is not None: if space is not None:
node.attrib[name] = str(space) node.attrib[name] = str(space)
def _xml_export(self, node, space, node_name='creole'): def _xml_export(self,
node,
space,
node_name=VARIABLE_NAMESPACE,
):
for name in self.get_attributes(space): for name in self.get_attributes(space):
subspace = getattr(space, name) subspace = getattr(space, name)
self._sub_xml_export(name, node, node_name, subspace, space) self._sub_xml_export(name, node, node_name, subspace, space)

25
src/rougail/path.py
View file

@ -1,6 +1,7 @@
from .i18n import _ from .i18n import _
from .utils import normalize_family from .utils import normalize_family
from .error import CreoleOperationError, CreoleDictConsistencyError from .error import CreoleOperationError, CreoleDictConsistencyError
from .annotator import VARIABLE_NAMESPACE
class Path: class Path:
@ -17,11 +18,11 @@ class Path:
def add_family(self, def add_family(self,
namespace: str, namespace: str,
name: str, name: str,
creoleobj: str, variableobj: str,
) -> str: # pylint: disable=C0111 ) -> str: # pylint: disable=C0111
self.families[name] = dict(name=name, self.families[name] = dict(name=name,
namespace=namespace, namespace=namespace,
creoleobj=creoleobj, variableobj=variableobj,
) )
def get_family_path(self, def get_family_path(self,
@ -34,7 +35,7 @@ class Path:
check_name=False, check_name=False,
allow_dot=True, allow_dot=True,
)] )]
if dico['namespace'] != 'creole' and current_namespace != dico['namespace']: if dico['namespace'] != VARIABLE_NAMESPACE and current_namespace != dico['namespace']:
raise CreoleDictConsistencyError(_('A family located in the {} namespace ' raise CreoleDictConsistencyError(_('A family located in the {} namespace '
'shall not be used in the {} namespace').format( 'shall not be used in the {} namespace').format(
dico['namespace'], current_namespace)) dico['namespace'], current_namespace))
@ -49,7 +50,7 @@ class Path:
if name not in self.families: if name not in self.families:
raise CreoleDictConsistencyError(_('unknown family {}').format(name)) raise CreoleDictConsistencyError(_('unknown family {}').format(name))
dico = self.families[name] dico = self.families[name]
return dico['creoleobj'] return dico['variableobj']
# Leadership # Leadership
def set_leader(self, def set_leader(self,
@ -58,7 +59,7 @@ class Path:
name: str, name: str,
leader_name: str, leader_name: str,
) -> None: # pylint: disable=C0111 ) -> None: # pylint: disable=C0111
if namespace != 'creole': if namespace != VARIABLE_NAMESPACE:
# need rebuild path and move object in new path # need rebuild path and move object in new path
old_path = namespace + '.' + leader_family_name + '.' + name old_path = namespace + '.' + leader_family_name + '.' + name
dico = self._get_variable(old_path) dico = self._get_variable(old_path)
@ -68,7 +69,7 @@ class Path:
new_path, new_path,
dico['family'], dico['family'],
False, False,
dico['creoleobj'], dico['variableobj'],
) )
name = new_path name = new_path
dico = self._get_variable(name) dico = self._get_variable(name)
@ -86,9 +87,9 @@ class Path:
name: str, name: str,
family: str, family: str,
is_dynamic: bool, is_dynamic: bool,
creoleobj, variableobj,
) -> str: # pylint: disable=C0111 ) -> str: # pylint: disable=C0111
if namespace == 'creole' or '.' in name: if namespace == VARIABLE_NAMESPACE or '.' in name:
varname = name varname = name
else: else:
varname = '.'.join([namespace, family, name]) varname = '.'.join([namespace, family, name])
@ -97,7 +98,7 @@ class Path:
namespace=namespace, namespace=namespace,
leader=None, leader=None,
is_dynamic=is_dynamic, is_dynamic=is_dynamic,
creoleobj=creoleobj) variableobj=variableobj)
def get_variable_name(self, def get_variable_name(self,
name, name,
@ -107,7 +108,7 @@ class Path:
def get_variable_obj(self, def get_variable_obj(self,
name:str, name:str,
) -> 'Variable': # pylint: disable=C0111 ) -> 'Variable': # pylint: disable=C0111
return self._get_variable(name)['creoleobj'] return self._get_variable(name)['variableobj']
def get_variable_family_name(self, def get_variable_family_name(self,
name: str, name: str,
@ -143,7 +144,7 @@ class Path:
else: else:
dico = self._get_variable(name) dico = self._get_variable(name)
if not allow_source: if not allow_source:
if dico['namespace'] not in ['creole', 'services'] and current_namespace != dico['namespace']: if dico['namespace'] not in [VARIABLE_NAMESPACE, 'services'] and current_namespace != dico['namespace']:
raise CreoleDictConsistencyError(_('A variable located in the {} namespace ' raise CreoleDictConsistencyError(_('A variable located in the {} namespace '
'shall not be used in the {} namespace').format( 'shall not be used in the {} namespace').format(
dico['namespace'], current_namespace)) dico['namespace'], current_namespace))
@ -169,7 +170,7 @@ class Path:
with_suffix: bool=False, with_suffix: bool=False,
) -> str: ) -> str:
if name not in self.variables: if name not in self.variables:
if name.startswith('creole.'): if name.startswith(f'{VARIABLE_NAMESPACE}.'):
name = name.split('.')[-1] name = name.split('.')[-1]
if name not in self.variables: if name not in self.variables:
for var_name, variable in self.variables.items(): for var_name, variable in self.variables.items():

23
src/rougail/template.py
View file

@ -18,6 +18,8 @@ from tempfile import mktemp
from Cheetah import Parser from Cheetah import Parser
from .annotator import VARIABLE_NAMESPACE
# l'encoding du template est déterminé par une regexp (encodingDirectiveRE dans Parser.py) # l'encoding du template est déterminé par une regexp (encodingDirectiveRE dans Parser.py)
# il cherche un ligne qui ressemble à '#encoding: utf-8 # il cherche un ligne qui ressemble à '#encoding: utf-8
@ -280,9 +282,9 @@ class CreoleTemplateEngine:
if not func.startswith('_'): if not func.startswith('_'):
eos[func] = getattr(eosfunc, func) eos[func] = getattr(eosfunc, func)
self.eosfunc = eos self.eosfunc = eos
self.creole_variables_dict = {} self.rougail_variables_dict = {}
async def load_eole_variables_creole(self, async def load_eole_variables_rougail(self,
optiondescription): optiondescription):
for option in await optiondescription.list('all'): for option in await optiondescription.list('all'):
if await option.option.isoptiondescription(): if await option.option.isoptiondescription():
@ -290,15 +292,15 @@ class CreoleTemplateEngine:
for idx, suboption in enumerate(await option.list('all')): for idx, suboption in enumerate(await option.list('all')):
if idx == 0: if idx == 0:
leader = CreoleLeader(await suboption.value.get()) leader = CreoleLeader(await suboption.value.get())
self.creole_variables_dict[await suboption.option.name()] = leader self.rougail_variables_dict[await suboption.option.name()] = leader
else: else:
await leader.add_follower(self.config, await leader.add_follower(self.config,
await suboption.option.name(), await suboption.option.name(),
await suboption.option.path()) await suboption.option.path())
else: else:
await self.load_eole_variables_creole(option) await self.load_eole_variables_rougail(option)
else: else:
self.creole_variables_dict[await option.option.name()] = await option.value.get() self.rougail_variables_dict[await option.option.name()] = await option.value.get()
async def load_eole_variables(self, async def load_eole_variables(self,
namespace, namespace,
@ -320,7 +322,7 @@ class CreoleTemplateEngine:
else: else:
variables[await variable.option.name()] = await variable.value.get() variables[await variable.option.name()] = await variable.value.get()
families[await family.option.name()] = CreoleExtra(variables) families[await family.option.name()] = CreoleExtra(variables)
self.creole_variables_dict[namespace] = CreoleExtra(families) self.rougail_variables_dict[namespace] = CreoleExtra(families)
def patch_template(self, def patch_template(self,
filename: str): filename: str):
@ -359,10 +361,11 @@ class CreoleTemplateEngine:
log.info(_(f"Cheetah processing: '{destfilename}'")) log.info(_(f"Cheetah processing: '{destfilename}'"))
try: try:
cheetah_template = CheetahTemplate(source, cheetah_template = CheetahTemplate(source,
self.creole_variables_dict, self.rougail_variables_dict,
self.eosfunc, self.eosfunc,
destfilename, destfilename,
variable) variable,
)
data = str(cheetah_template) data = str(cheetah_template)
except CheetahNotFound as err: except CheetahNotFound as err:
varname = err.args[0][13:-1] varname = err.args[0][13:-1]
@ -422,8 +425,8 @@ class CreoleTemplateEngine:
namespace = await option.option.name() namespace = await option.option.name()
if namespace in ['services', 'actions']: if namespace in ['services', 'actions']:
continue continue
elif namespace == 'creole': elif namespace == VARIABLE_NAMESPACE:
await self.load_eole_variables_creole(option) await self.load_eole_variables_rougail(option)
else: else:
await self.load_eole_variables(namespace, await self.load_eole_variables(namespace,
option) option)

2
tests/flattener_dicos/00load_autofreeze/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.module_instancie": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.module_instancie": "non"}

4
tests/flattener_dicos/00load_autofreeze/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -10,7 +10,7 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>basic</property> <property>basic</property>
<property expected="oui" inverse="True" source="creole.general.module_instancie" type="calculation">auto_frozen</property> <property expected="oui" inverse="True" source="rougail.general.module_instancie" type="calculation">auto_frozen</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="module_instancie" type="choice"> <variable doc="No change" multi="False" name="module_instancie" type="choice">

2
tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.module_instancie": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.module_instancie": "non"}

4
tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -10,7 +10,7 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>expert</property> <property>expert</property>
<property expected="oui" inverse="True" source="creole.general.module_instancie" type="calculation">auto_frozen</property> <property expected="oui" inverse="True" source="rougail.general.module_instancie" type="calculation">auto_frozen</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="module_instancie" type="choice"> <variable doc="No change" multi="False" name="module_instancie" type="choice">

2
tests/flattener_dicos/00load_autosave/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non"} {"rougail.general.mode_conteneur_actif": "non"}

2
tests/flattener_dicos/00load_autosave/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/00load_autosaveexpert/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non"} {"rougail.general.mode_conteneur_actif": "non"}

2
tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>expert</property> <property>expert</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/00load_comment/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non"} {"rougail.general.mode_conteneur_actif": "non"}

2
tests/flattener_dicos/00load_comment/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/00load_notype/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.without_type": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.without_type": "non"}

2
tests/flattener_dicos/00load_notype/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/00load_save/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non"} {"rougail.general.mode_conteneur_actif": "non"}

2
tests/flattener_dicos/00load_save/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/00load_subfolder/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/00load_subfolder/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/01auto_base/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/01auto_base/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -12,7 +12,7 @@
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01auto_withoutparam/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/01base_multi/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": ["non"]} {"rougail.general.mode_conteneur_actif": ["non"]}

2
tests/flattener_dicos/01base_multi/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="Redefine description" multi="True" name="mode_conteneur_actif" type="choice"> <variable doc="Redefine description" multi="True" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/01base_submulti/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": [["non"]]} {"rougail.general.mode_conteneur_actif": [["non"]]}

2
tests/flattener_dicos/01base_submulti/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="Redefine description" multi="submulti" name="mode_conteneur_actif" type="choice"> <variable doc="Redefine description" multi="submulti" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/01fill_autofreeze/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non", "creole.general.module_instancie": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"}

6
tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -10,9 +10,9 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>basic</property> <property>basic</property>
<property expected="oui" inverse="True" source="creole.general.module_instancie" type="calculation">auto_frozen</property> <property expected="oui" inverse="True" source="rougail.general.module_instancie" type="calculation">auto_frozen</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_autosave/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/01fill_autosave/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -10,7 +10,7 @@
<property>mandatory</property> <property>mandatory</property>
<property>basic</property> <property>basic</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_base/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/01fill_base/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -12,7 +12,7 @@
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_baseaccent/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="Général" name="general"> <family doc="Général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -12,7 +12,7 @@
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_mandatory/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/01fill_mandatory/result/00-base.xml
View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="domain"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="domain">
<property>mandatory</property> <property>mandatory</property>
<property>expert</property> <property>expert</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_number/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01fill_number/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="number"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="number">

2
tests/flattener_dicos/01fill_optional/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/01fill_optional/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -12,7 +12,7 @@
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param> <param transitive="False" type="variable">rougail.general.mode_conteneur_actif1</param>
</value> </value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01separator_base/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non"} {"rougail.general.mode_conteneur_actif": "non"}

4
tests/flattener_dicos/01separator_base/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -15,7 +15,7 @@
</variable> </variable>
</family> </family>
<separators> <separators>
<separator name="creole.general.mode_conteneur_actif">Établissement</separator> <separator name="rougail.general.mode_conteneur_actif">Établissement</separator>
</separators> </separators>
</family> </family>
</rougail> </rougail>

2
tests/flattener_dicos/01separator_neverhidden/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non"} {"rougail.general.mode_conteneur_actif": "non"}

4
tests/flattener_dicos/01separator_neverhidden/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -15,7 +15,7 @@
</variable> </variable>
</family> </family>
<separators> <separators>
<separator name="creole.general.mode_conteneur_actif" never_hidden="True">Établissement</separator> <separator name="rougail.general.mode_conteneur_actif" never_hidden="True">Établissement</separator>
</separators> </separators>
</family> </family>
</rougail> </rougail>

2
tests/flattener_dicos/10autosave_hidden/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.autosavevar": null} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null}

2
tests/flattener_dicos/10autosave_hidden/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.autosavevar": null} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null}

8
tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -16,9 +16,9 @@
<variable doc="autosave variable" multi="False" name="autosavevar" type="string"> <variable doc="autosave variable" multi="False" name="autosavevar" type="string">
<property>force_store_value</property> <property>force_store_value</property>
<property>basic</property> <property>basic</property>
<property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">frozen</property> <property expected="oui" inverse="False" source="rougail.general.mode_conteneur_actif" type="calculation">frozen</property>
<property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">hidden</property> <property expected="oui" inverse="False" source="rougail.general.mode_conteneur_actif" type="calculation">hidden</property>
<property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">force_default_on_freeze</property> <property expected="oui" inverse="False" source="rougail.general.mode_conteneur_actif" type="calculation">force_default_on_freeze</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="string">oui</param> <param transitive="False" type="string">oui</param>
</value> </value>

2
tests/flattener_dicos/10check_base/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "b", "creole.general.int": null} {"rougail.general.mode_conteneur_actif": "b", "rougail.general.int": null}

2
tests/flattener_dicos/10check_base/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="string"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">

2
tests/flattener_dicos/10check_option/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "b", "creole.general.int2": 100, "creole.general.int": null} {"rougail.general.mode_conteneur_actif": "b", "rougail.general.int2": 100, "rougail.general.int": null}

4
tests/flattener_dicos/10check_option/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="string"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">
@ -16,7 +16,7 @@
<variable doc="No change" multi="False" name="int" type="number"> <variable doc="No change" multi="False" name="int" type="number">
<check name="valid_entier" warnings_only="False"> <check name="valid_entier" warnings_only="False">
<param name="mini" type="string">0</param> <param name="mini" type="string">0</param>
<param name="maxi" type="variable">creole.general.int2</param> <param name="maxi" type="variable">rougail.general.int2</param>
</check> </check>
<property>normal</property> <property>normal</property>
</variable> </variable>

2
tests/flattener_dicos/10check_optional/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "b", "creole.general.int": null, "creole.general.int2": null} {"rougail.general.mode_conteneur_actif": "b", "rougail.general.int": null, "rougail.general.int2": null}

4
tests/flattener_dicos/10check_optional/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="string"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">
@ -10,7 +10,7 @@
</variable> </variable>
<variable doc="No change" multi="False" name="int" type="number"> <variable doc="No change" multi="False" name="int" type="number">
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.int2</param> <param type="variable">rougail.general.int2</param>
</check> </check>
<check name="valid_not_equal" warnings_only="False"/> <check name="valid_not_equal" warnings_only="False"/>
<property>normal</property> <property>normal</property>

2
tests/flattener_dicos/10check_valid_differ/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "oui", "rougail.general.mode_conteneur_actif1": "non"}

4
tests/flattener_dicos/10check_valid_differ/result/00-base.xml
View file

@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif1</param> <param type="variable">rougail.general.mode_conteneur_actif1</param>
</check> </check>
<choice type="string">oui</choice> <choice type="string">oui</choice>
<choice type="string">non</choice> <choice type="string">non</choice>

2
tests/flattener_dicos/10check_valid_differ_add/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.mode_conteneur_actif3": "oui"} {"rougail.general.mode_conteneur_actif": "oui", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general.mode_conteneur_actif3": "oui"}

10
tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -26,16 +26,16 @@
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string"> <variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string">
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif1</param> <param type="variable">rougail.general.mode_conteneur_actif1</param>
</check> </check>
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif2</param> <param type="variable">rougail.general.mode_conteneur_actif2</param>
</check> </check>
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif1</param> <param type="variable">rougail.general.mode_conteneur_actif1</param>
</check> </check>
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif2</param> <param type="variable">rougail.general.mode_conteneur_actif2</param>
</check> </check>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>

2
tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.mode_conteneur_actif3": "oui"} {"rougail.general.mode_conteneur_actif": "oui", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general.mode_conteneur_actif3": "oui"}

6
tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -26,10 +26,10 @@
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string"> <variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string">
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif1</param> <param type="variable">rougail.general.mode_conteneur_actif1</param>
</check> </check>
<check name="valid_not_equal" warnings_only="False"> <check name="valid_not_equal" warnings_only="False">
<param type="variable">creole.general.mode_conteneur_actif2</param> <param type="variable">rougail.general.mode_conteneur_actif2</param>
</check> </check>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>

2
tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "oui", "creole.general.adresse_ip_eth0": null, "creole.general.adresse_netmask_eth0": null} {"rougail.general.mode_conteneur_actif": "oui", "rougail.general.adresse_ip_eth0": null, "rougail.general.adresse_netmask_eth0": null}

4
tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -16,7 +16,7 @@
</variable> </variable>
<variable doc="Masque de sous réseau de la carte" multi="False" name="adresse_netmask_eth0" type="netmask"> <variable doc="Masque de sous réseau de la carte" multi="False" name="adresse_netmask_eth0" type="netmask">
<check name="valid_ip_netmask" warnings_only="True"> <check name="valid_ip_netmask" warnings_only="True">
<param type="variable">creole.general.adresse_ip_eth0</param> <param type="variable">rougail.general.adresse_ip_eth0</param>
</check> </check>
<property>mandatory</property> <property>mandatory</property>
<property>basic</property> <property>basic</property>

2
tests/flattener_dicos/10leadership_append/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader.follower3": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": [], "rougail.general1.leader.follower3": []}

4
tests/flattener_dicos/10leadership_append/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -25,7 +25,7 @@
<variable doc="follower2" multi="True" name="follower2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general1.leader.follower1</param> <param transitive="False" type="variable">rougail.general1.leader.follower1</param>
</value> </value>
</variable> </variable>
<variable doc="follower3" multi="True" name="follower3" type="string"> <variable doc="follower3" multi="True" name="follower3" type="string">

2
tests/flattener_dicos/10leadership_auto/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": [], "creole.general.leader.follower3": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": [], "rougail.general.leader.follower3": []}

6
tests/flattener_dicos/10leadership_auto/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -28,7 +28,7 @@
<property>hidden</property> <property>hidden</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.follower1</param> <param transitive="False" type="variable">rougail.general.leader.follower1</param>
</value> </value>
</variable> </variable>
<variable doc="follower3" multi="True" name="follower3" type="string"> <variable doc="follower3" multi="True" name="follower3" type="string">
@ -37,7 +37,7 @@
<property>hidden</property> <property>hidden</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.leader</param> <param transitive="False" type="variable">rougail.general.leader.leader</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10leadership_autoleader/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []}

4
tests/flattener_dicos/10leadership_autoleader/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -28,7 +28,7 @@
<property>hidden</property> <property>hidden</property>
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.leader</param> <param transitive="False" type="variable">rougail.general.leader.leader</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.leadermode.leader.leader": [], "creole.leadermode.leader.follower1": [], "creole.leadermode.leader.follower2": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.leadermode.leader.leader": [], "rougail.leadermode.leader.follower1": [], "rougail.leadermode.leader.follower2": []}

2
tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>expert</property> <property>expert</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []}

4
tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -22,7 +22,7 @@
<variable doc="follower2" multi="True" name="follower2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>expert</property> <property>expert</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.follower1</param> <param transitive="False" type="variable">rougail.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10leadership_familyaccent/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []}

4
tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="Général" name="general"> <family doc="Général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -22,7 +22,7 @@
<variable doc="follower2" multi="True" name="follower2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.follower1</param> <param transitive="False" type="variable">rougail.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []}

4
tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>basic</property> <property>basic</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -24,7 +24,7 @@
<variable doc="follower2" multi="True" name="follower2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.follower1</param> <param transitive="False" type="variable">rougail.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10leadership_mandatory/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []}

4
tests/flattener_dicos/10leadership_mandatory/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -23,7 +23,7 @@
<variable doc="follower2" multi="True" name="follower2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general.leader.follower1</param> <param transitive="False" type="variable">rougail.general.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "oui", "creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": []} {"rougail.general.mode_conteneur_actif": "oui", "rougail.general.nut_monitor_netmask.nut_monitor_netmask": [], "rougail.general.nut_monitor_netmask.nut_monitor_host": []}

2
tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="général" name="general"> <family doc="général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">

2
tests/flattener_dicos/10leadership_multi/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader1.leader1": [], "creole.general1.leader1.follower11": [], "creole.general1.leader1.follower21": []} {"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": [], "rougail.general1.leader1.leader1": [], "rougail.general1.leader1.follower11": [], "rougail.general1.leader1.follower21": []}

4
tests/flattener_dicos/10leadership_multi/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
@ -25,7 +25,7 @@
<variable doc="follower2" multi="True" name="follower2" type="string"> <variable doc="follower2" multi="True" name="follower2" type="string">
<property>normal</property> <property>normal</property>
<value name="calc_val" type="calculation"> <value name="calc_val" type="calculation">
<param transitive="False" type="variable">creole.general1.leader.follower1</param> <param transitive="False" type="variable">rougail.general1.leader.follower1</param>
</value> </value>
</variable> </variable>
</leader> </leader>

2
tests/flattener_dicos/10load_disabled_if_in/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"}

6
tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="condition" type="choice"> <variable doc="No change" multi="False" name="condition" type="choice">
@ -18,7 +18,7 @@
<property>hidden</property> <property>hidden</property>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
@ -29,7 +29,7 @@
<property>hidden</property> <property>hidden</property>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>

2
tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"}

6
tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="condition" type="string"> <variable doc="No change" multi="False" name="condition" type="string">
@ -16,7 +16,7 @@
<property>hidden</property> <property>hidden</property>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
@ -27,7 +27,7 @@
<property>hidden</property> <property>hidden</property>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>

2
tests/flattener_dicos/10load_disabled_if_inaccent/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general2.mode_conteneur_actif3": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general2.mode_conteneur_actif3": "non"}

8
tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="Général" name="general"> <family doc="Général" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="condition" type="choice"> <variable doc="No change" multi="False" name="condition" type="choice">
@ -15,7 +15,7 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
@ -23,13 +23,13 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>
<family doc="Général2" name="general2"> <family doc="Général2" name="general2">
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif3" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif3" type="choice">
<choice type="string">oui</choice> <choice type="string">oui</choice>
<choice type="string">non</choice> <choice type="string">non</choice>

2
tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif2": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif2": "non"}

4
tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="condition" type="choice"> <variable doc="No change" multi="False" name="condition" type="choice">
@ -23,7 +23,7 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>

2
tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"}

6
tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="condition" type="choice"> <variable doc="No change" multi="False" name="condition" type="choice">
@ -15,7 +15,7 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
@ -23,7 +23,7 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>

2
tests/flattener_dicos/10load_emptyvalue/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif2": null} {"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif2": null}

2
tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="string"> <variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">

2
tests/flattener_dicos/10load_frozenifin/makedict/base.json
View file

@ -1 +1 @@
{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"}

14
tests/flattener_dicos/10load_frozenifin/result/00-base.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<rougail> <rougail>
<family doc="" name="creole"> <family doc="" name="rougail">
<family doc="general" name="general"> <family doc="general" name="general">
<property>normal</property> <property>normal</property>
<variable doc="No change" multi="False" name="condition" type="choice"> <variable doc="No change" multi="False" name="condition" type="choice">
@ -15,9 +15,9 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">frozen</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">frozen</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">hidden</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">hidden</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">force_default_on_freeze</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">force_default_on_freeze</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice"> <variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
@ -25,9 +25,9 @@
<choice type="string">non</choice> <choice type="string">non</choice>
<property>mandatory</property> <property>mandatory</property>
<property>normal</property> <property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">frozen</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">frozen</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">hidden</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">hidden</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">force_default_on_freeze</property> <property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">force_default_on_freeze</property>
<value type="string">non</value> <value type="string">non</value>
</variable> </variable>
</family> </family>

Some files were not shown because too many files have changed in this diff Show more