Skip to content

Commit

Permalink
combiners: Handle cases with multiple series and raw keys
Browse files Browse the repository at this point in the history
The new combiner logic to split out the raw key from ::-delimited series
names breaks down if there is *both* a multiple-generated dataset (from
"duplicates"), *and* a raw key. Fix this by only splitting at the
right-most :: part when trying to find a raw key.

Fixes #166.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
  • Loading branch information
tohojo committed Jul 8, 2019
1 parent 6778f39 commit 48ecf31
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion flent/combiners.py
Expand Up @@ -661,7 +661,7 @@ def get_rawdata(self, resultset, series):
rawdata = self._get_series(resultset, key, ensure=raw_key)
except KeyError:
if '::' in key and 'raw_key' not in series:
key, raw_key = key.split("::")
key, raw_key = key.rsplit("::", 1)
try:
rawdata = self._get_series(resultset, key, ensure=raw_key)
except KeyError:
Expand Down

0 comments on commit 48ecf31

Please sign in to comment.