Allow multiple properties in pvmap for headers (datacommonsorg#1479)

* Allow numeric values for properties with multiple values

* Ignore differ output if differ not run

* fix typo

* Allow #Header to have multiple properties

* allow empty values for header props

* lint

Author: ajaits

tools/statvar_importer/property_value_mapper.py

@@ -188,7 +188,7 @@ def load_pvs_from_file(self, filename: str, namespace: str = 'GLOBAL'):
                             #pvs[prop] = value
                             normalize = True
                             if '#' in prop or '=' in value:
-                                # Value is a formula. e value as a string.
+                                # Value is a formula. Set value as a string.
                                 normalize = False
                             pv_utils.add_key_value(prop,
                                                    value,
@@ -219,12 +219,12 @@ def load_pvs_dict(self, pv_map_input: dict, namespace: str = 'GLOBAL'):
                 pvs_input = {namespace: pvs_input}
             for p, v in pvs_input.items():
                 num_keys_added += 1
-                pv_utils.add_key_value(
-                    p,
-                    v,
-                    pvs_dict,
-                    self._config.get('multi_value_properties', {}),
-                )
+                pv_utils.add_key_value(p,
+                                       v,
+                                       pvs_dict,
+                                       self._config.get(
+                                           'multi_value_properties', {}),
+                                       normalize=False)
             # Track the max number of words in any of the keys.
             # This is used when splitting input-string for lookups.
             num_words_key = len(pv_utils.get_words(key, word_delimiter))

tools/statvar_importer/property_value_utils.py

@@ -134,7 +134,11 @@ def get_value_as_list(value: str) -> Union[str, list]:
 def pvs_update(new_pvs: dict, pvs: dict, multi_value_keys: set = {}) -> dict:
     """Add the key:value pairs from the new_pvs into the pvs dictionary."""
     for prop, value in new_pvs.items():
-        add_key_value(prop, value, pvs, multi_value_keys)
+        add_key_value(prop,
+                      value,
+                      pvs,
+                      multi_value_keys=multi_value_keys,
+                      normalize=False)
     return pvs
 
 

tools/statvar_importer/stat_var_processor.py

@@ -1675,8 +1675,10 @@ def resolve_value_references(self,
                         prop,
                         value,
                         pvs,
-                        self._config.get('multi_value_properties', {}),
+                        multi_value_keys=self._config.get(
+                            'multi_value_properties', {}),
                         overwrite=False,
+                        normalize=False,
                     )
                     logging.level_debug() and logging.log(
                         2, f'Adding {value} for {prop}:{pvs.get(prop)}')
@@ -1936,10 +1938,10 @@ def process_row_header_pvs(
                 for prop in col_header_props:
                     # Use any property=value in the header tag or
                     # get the value from the column PVs
-                    value = col_pvs.get(prop, '')
+                    value = col_pvs.get(prop, None)
                     if '=' in prop:
                         prop, value = prop.split('=', 1)
-                    if value:
+                    if value is not None:
                         col_header_pvs[prop] = value
                 if col_header_pvs:
                     col_headers[col_index] = col_header_pvs
@@ -2083,22 +2085,22 @@ def process_row(self, row: list, row_index: int):
                     if (value is not None and
                             prop not in self._internal_reference_keys and
                             not self.get_reference_names(value)):
-                        pv_utils.add_key_value(prop,
-                                               value,
-                                               row_pvs,
-                                               self._config.get(
-                                                   'multi_value_properties',
-                                                   {}),
-                                               normalize=False)
+                        pv_utils.add_key_value(
+                            prop,
+                            value,
+                            row_pvs,
+                            multi_value_keys=self._config.get(
+                                'multi_value_properties', {}),
+                            normalize=False)
                 for prop, value in row_col_pvs.get(col_index, {}).items():
                     if value is not None and prop not in self._internal_reference_keys:
-                        pv_utils.add_key_value(prop,
-                                               value,
-                                               row_pvs,
-                                               self._config.get(
-                                                   'multi_value_properties',
-                                                   {}),
-                                               normalize=False)
+                        pv_utils.add_key_value(
+                            prop,
+                            value,
+                            row_pvs,
+                            multi_value_keys=self._config.get(
+                                'multi_value_properties', {}),
+                            normalize=False)
         if config_flags.get_value_type(row_pvs.get('#IgnoreRow'), False):
             logging.level_debug() and logging.log(
                 2, f'Ignoring row: {row} in {self._file_context}')