obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Better handling of column lines with all values at NA

Browse Source
This commit is contained in:
Celine Mercier
2019-08-27 20:20:26 +02:00
parent ae5f42c260
commit 3d1b2e8ed9
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/obitools3/dms/column/column.pyx
View File

@ -491,7 +491,7 @@ cdef class Column_multi_elts(Column) :
cdef object values_iter
if not self.active() :
raise OBIDeactivatedInstanceError()
if values is None or len(values) == 0 :
if values is None or len(values) == 0 or (isinstance(values, Column_line) and values.is_NA()):
for element_name in self._elements_names :
self.set_item(line_nb, element_name, None)
else :
@ -540,6 +540,10 @@ cdef class Column_line :
return str(self._column.get_line(self._index))
def is_NA(self):
return self._column.get_line(self._index) is None
def __iter__(self) :
cdef list elements_names
cdef bytes element_name
@ -569,6 +573,8 @@ cdef class Column_line :
def __str__(self):
cdef dict d
cdef str s
if self.is_NA():
return ""
d = {}
for k,v in self.items():
if type(v) == bytes:

4
python/obitools3/format/header.pyx
View File

@ -56,9 +56,11 @@ cdef class HeaderFormat:
for k in ktags:
if k in tags:
value = data[k]
if value is None:
if value is None or (isinstance(value, Column_line) and value.is_NA()):
if self.printNAKeys:
value = self.NAString
else:
value = None
else:
if type(value) == Column_line:
value = value.bytes()