Merge pull request #330 from andlaus/random_fixes

Random fixes
mercedes-benz · Aug 9, 2024 · 9af7857 · 9af7857
2 parents 3c18607 + 21f784d
commit 9af7857
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/odxtools/parameterinfo.py b/odxtools/parameterinfo.py
@@ -132,7 +132,16 @@ def parameter_info(param_list: Iterable[Parameter], quoted_names: bool = False)
                 val_str = ""
                 if scale.lower_limit is not None:
                     val_str = f"({repr(scale.lower_limit.value)})"
-                of.write(f"  {repr(scale.compu_const)}{val_str}\n")
+
+                if scale.compu_const is None:
+                    of.write(f"  <ERROR in ODX data: no value specified>\n")
+                else:
+                    vt = scale.compu_const.vt
+                    v = scale.compu_const.v
+                    if vt is not None:
+                        of.write(f"  \"{vt}\" {val_str}\n")
+                    else:
+                        of.write(f"  {v}\n")
 
         elif isinstance(cm, IdenticalCompuMethod):
             bdt = dop.physical_type.base_data_type

diff --git a/odxtools/templates/macros/printCompuMethod.xml.jinja2 b/odxtools/templates/macros/printCompuMethod.xml.jinja2
@@ -18,7 +18,7 @@
 {%- if limit_obj.value_raw is none %}
   {#- #}/>
 {%- else %}
-  {#- #}>{{- limit_obj.value_raw }}</{{tag_name}}>
+  {#- #}>{{- limit_obj.value_raw | e }}</{{tag_name}}>
 {%- endif -%}
 {%- endif -%}
 {%- endmacro -%}