Skip to content

Commit 6a2d6ba

Browse files
author
Martin
committed
bug fix
1 parent 45a615f commit 6a2d6ba

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

converter_app/readers/uxd_reader.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@ def __init__(self, file: File):
2222
self._file_extensions = ['.uxd']
2323
self._table = None
2424
self._version = 2
25+
self._max_table_length = 0
2526

2627
def check(self):
2728
return self.file.suffix.lower() in self._file_extensions
2829

2930
def _read_data(self, line: str):
3031
if self._version == 2:
3132
try:
32-
for value in [self.as_number(x.strip()) for x in line.split(' ') if x != '']:
33-
self._table['rows'].append([value])
33+
new_row = [self.as_number(x.strip()) for x in line.split(' ') if x != '']
34+
if len(new_row) > 0:
35+
self._max_table_length = max(self._max_table_length, len(new_row))
36+
self._table['rows'].append(new_row)
3437
except ValueError:
3538
pass
3639
elif self._version == 3:
@@ -47,8 +50,6 @@ def _add_metadata(self, key, val):
4750

4851
def prepare_tables(self):
4952
tables = []
50-
tables = []
51-
# xml_str = re.sub(r'\sxmlns\s*([:=])', r' xmlns_removed\g<1>', self.file.string)
5253
self._table = self.append_table(tables)
5354
data_rows = []
5455
for row in self.file.fp.readlines():
@@ -71,6 +72,10 @@ def prepare_tables(self):
7172
for row in data_rows:
7273
self._read_data(row)
7374

75+
for row in self._table['rows']:
76+
while len(row) < self._max_table_length:
77+
row.append('')
78+
7479
if 'START' in self._table['metadata'] and 'STEPSIZE' in self._table['metadata']:
7580
end = self.as_number(self._table['metadata']['START']) + (
7681
self.as_number(self._table['metadata']['STEPSIZE']) * (len(self._table['rows']) - 1))

0 commit comments

Comments
 (0)