export: fixed a bug where exporting to tab format with a header would

not export the first line of data and switch to version 3.0.0b39

python/obitools3/commands/ngsfilter.pyx

@@ -24,10 +24,6 @@ from cpython.exc cimport PyErr_CheckSignals
 from io import BufferedWriter
 
 
-#REVERSE_SEQ_COLUMN_NAME = b"REVERSE_SEQUENCE"      # used by alignpairedend tool
-#REVERSE_QUALITY_COLUMN_NAME = b"REVERSE_QUALITY"   # used by alignpairedend tool
-
-
 __title__="Assigns sequence records to the corresponding experiment/sample based on DNA tags and primers"
 
 

python/obitools3/format/tab.pyx

@@ -23,9 +23,8 @@ cdef class TabFormat:
         if self.first_line:
             self.tags = [k for k in data.keys()]
         
-        for k in self.tags:
-            
         if self.header and self.first_line:
+            for k in self.tags:
                 if isinstance(data.view[k], Column_multi_elts):
                     keys = data.view[k].keys()
                     keys.sort()
@@ -33,7 +32,11 @@ cdef class TabFormat:
                         line.append(tobytes(k)+b':'+tobytes(k2))
                 else:
                     line.append(tobytes(k))
-            else:
+            r = self.sep.join(value for value in line)
+            r += b'\n'
+            line = []
+                    
+        for k in self.tags:
             value = data[k]
             if isinstance(data.view[k], Column_multi_elts):
                 keys = data.view[k].keys()
@@ -53,7 +56,12 @@ cdef class TabFormat:
                 else:
                     line.append(self.NAString)
                   	      	
+        if self.header and self.first_line:
+            r += self.sep.join(value for value in line)
+        else:
+            r = self.sep.join(value for value in line)
+
         if self.first_line:
             self.first_line = False
 
-        return self.sep.join(value for value in line)
+        return r

python/obitools3/version.py

@@ -1,5 +1,5 @@
 major = 3
 minor = 0
-serial= '0b38'
+serial= '0b39'
 
 version ="%d.%d.%s" % (major,minor,serial)