Skip to content
Snippets Groups Projects
Commit e41160a5 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

MAINT: Refactor and simplify adding of properties

parent 36e27fb0
No related branches found
No related tags found
2 merge requests!39Release 0.4.0,!36Revert "Revert "Merge branch 'f-extend-yaml-model' into 'dev'""
Pipeline #20413 passed
......@@ -325,30 +325,26 @@ class Parser(object):
n = self._stringify(n)
if isinstance(e, dict):
if "datatype" in e:
if _get_listdatatype(e["datatype"]) is not None:
self.model[ent_name].add_property(
name=n,
importance=importance,
datatype=db.LIST(_get_listdatatype(e["datatype"])))
else:
self.model[ent_name].add_property(
name=n,
importance=importance,
datatype=e["datatype"]
)
if "datatype" in e and _get_listdatatype(e["datatype"]) is not None:
datatype = db.LIST(_get_listdatatype(e["datatype"]))
else:
self.model[ent_name].add_property(
name=n,
importance=importance
)
# ignore a possible e["datatype"] here if it's not a list
# since it has been treated in the definition of the
# property (entity) already
datatype = None
if "value" in e:
self.model[ent_name].get_property(n).value = e["value"]
value = e["value"]
else:
value = None
else:
self.model[ent_name].add_property(name=n,
value=e,
importance=importance)
value = e
datatype = None
self.model[ent_name].add_property(name=n,
value=value,
importance=importance,
datatype=datatype)
def _inherit(self, name, prop, inheritance):
if not isinstance(prop, list):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment