Skip to content

Commit 9341843

Browse files
committed
added check for multiple values in compound object
1 parent bafe249 commit 9341843

1 file changed

Lines changed: 18 additions & 3 deletions

File tree

reports/dataset.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,23 @@ def get_value_recursive(self, valuesString, field):
237237
return valuesString
238238
elif field['typeClass'] == 'compound':
239239
subValue = ''
240-
for value in field['value']:
240+
if isinstance(field['value'], list):
241+
for value in field['value']:
242+
if isinstance(value, str):
243+
self.logger.debug("Value: %s", value)
244+
for key, elements in value.items():
245+
if not elements['multiple']:
246+
subValue += elements['value']
247+
else:
248+
subValue += self.get_value_recursive(valuesString, subValue, elements['value'])
249+
250+
self.logger.debug("New subValue: %s", subValue)
251+
subValue += " - "
252+
253+
valuesString += subValue + " ; "
254+
else:
255+
value = field['value']
241256
for key, elements in value.items():
242-
self.logger.debug("Key: %s", key)
243257
if not elements['multiple']:
244258
subValue += elements['value']
245259
else:
@@ -248,9 +262,10 @@ def get_value_recursive(self, valuesString, field):
248262
self.logger.debug("New subValue: %s", subValue)
249263
subValue += " - "
250264

251-
subValue = subValue[:-3]
252265
valuesString += subValue + " ; "
253266

267+
if valuesString.endswith(' ; '):
268+
valuesString = valuesString[:-len(' ; ')]
254269
self.logger.debug("New value of valuesString: %s", str(valuesString))
255270
return valuesString
256271
else:

0 commit comments

Comments
 (0)