Switch to version 3.0.1b9

import of lists, fixed skipping of errors (was not overwriting), and
fixed --no-progress-bar option

python/obitools3/apps/optiongroups/__init__.py

@@ -1,3 +1,9 @@
+import codecs
+
+def unescaped_str(arg_str):
+    return arg_str.encode('latin-1', 'backslashreplace').decode('unicode-escape')
+
+
 def __addInputOption(optionManager):
     
     optionManager.add_argument(
@@ -43,7 +49,13 @@ def __addImportInputOption(optionManager):
                      action="store_const", dest="obi:inputformat",
                      default=None,
                      const=b'silva',
-                     help="Input file is in SILVA fasta format")
+                     help="Input file is in SILVA fasta format. If NCBI taxonomy provided with --taxonomy, taxid and scientific name will be added for each sequence.")
+
+    group.add_argument('--rdp-input',
+                     action="store_const", dest="obi:inputformat",
+                     default=None,
+                     const=b'rdp',
+                     help="Input file is in RDP training set fasta format. If NCBI taxonomy provided with --taxonomy, taxid and scientific name will be added for each sequence.")
 
     group.add_argument('--embl-input',
                      action="store_const", dest="obi:inputformat",
@@ -133,7 +145,7 @@ def __addTabularOption(optionManager):
     group.add_argument('--sep',
                      action="store", dest="obi:sep",
                      default="\t",
-                     type=str,
+                     type=unescaped_str,
                      help="Column separator")
 
 

python/obitools3/commands/addtaxids.pyx

@@ -26,7 +26,7 @@ import sys
 from cpython.exc cimport PyErr_CheckSignals
 
  
-__title__="Annotate sequences with their corresponding NCBI taxid found from the taxon scientific name."
+__title__="Annotate sequences with their corresponding NCBI taxid found from the taxon scientific name"
 
 
  
@@ -45,7 +45,7 @@ def addOptions(parser):
                        metavar="<TAXID_TAG>",
                        default=b"TAXID",
                        help="Name of the tag to store the found taxid "
-                            "(default: 'TAXID'.")
+                            "(default: 'TAXID').")
 
     group.add_argument('-n', '--taxon-name-tag', 
                        action="store", 
@@ -53,7 +53,7 @@ def addOptions(parser):
                        metavar="<SCIENTIFIC_NAME_TAG>",
                        default=b"SCIENTIFIC_NAME",
                        help="Name of the tag giving the scientific name of the taxon "
-                            "(default: 'SCIENTIFIC_NAME'.")
+                            "(default: 'SCIENTIFIC_NAME').")
 
     group.add_argument('-g', '--try-genus-match',
                      action="store_true", dest="addtaxids:try_genus_match",
@@ -174,6 +174,7 @@ def run(config):
                 taxid_column[i] = taxon.taxid
                 found_count+=1
             elif try_genus: # try finding genus or other parent taxon from the first word
+                #print(i, o_view[i].id)
                 taxon_name_sp = taxon_name.split(b" ")
                 taxon = taxo.get_taxon_by_name(taxon_name_sp[0], res_anc)
                 if taxon is not None:

python/obitools3/commands/align.pyx

@@ -19,7 +19,7 @@ import time
 import sys
 
 
-__title__="Aligns one sequence column with itself or two sequence columns"
+__title__="Align one sequence column with itself or two sequence columns"
 
 
 def addOptions(parser):
@@ -158,7 +158,7 @@ def run(config):
     i_view_name = i_uri.split(b"/")[0]
     i_column_name = b""
     i_element_name = b""
-    if len(i_uri.split(b"/")) == 2:
+    if len(i_uri.split(b"/")) >= 2:
         i_column_name = i_uri.split(b"/")[1]
     if len(i_uri.split(b"/")) == 3:
         i_element_name = i_uri.split(b"/")[2]
@@ -181,7 +181,7 @@ def run(config):
         i_dms_name_2 = i_dms_2.name
         i_uri_2 = input_2[1]
         original_i_view_name_2 = i_uri_2.split(b"/")[0]
-        if len(i_uri_2.split(b"/")) == 2:
+        if len(i_uri_2.split(b"/")) >= 2:
             i_column_name_2 = i_uri_2.split(b"/")[1]
         if len(i_uri_2.split(b"/")) == 3:
             i_element_name_2 = i_uri_2.split(b"/")[2]

python/obitools3/commands/alignpairedend.pyx

@@ -23,7 +23,7 @@ import os
 
 from cpython.exc cimport PyErr_CheckSignals
 
-__title__="Aligns paired-ended reads"
+__title__="Align paired-ended reads"
 
 
 
@@ -205,10 +205,16 @@ def run(config):
     if type(entries) == list:
         forward = entries[0]
         reverse = entries[1]
+        if len(forward) == 0 or len(reverse) == 0:
+            aligner = None
+        else:
             aligner = Kmer_similarity(forward, \
                                       view2=reverse, \
                                       kmer_size=config['alignpairedend']['kmersize'], \
                                       reversed_column=None)
+    else:
+        if len(entries) == 0:
+            aligner = None
         else:
             aligner = Kmer_similarity(entries, \
                                       column2=entries[REVERSE_SEQUENCE_COLUMN], \
@@ -251,7 +257,7 @@ def run(config):
         pb(i, force=True)
         print("", file=sys.stderr)
 
-    if kmer_ali :
+    if kmer_ali and aligner is not None:
         aligner.free()
 
     # Save command config in View and DMS comments

python/obitools3/commands/build_ref_db.pyx

@@ -16,7 +16,7 @@ import sys
 from cpython.exc cimport PyErr_CheckSignals
 
 
-__title__="Tag a set of sequences for PCR and sequencing errors identification"
+__title__="Build a reference database for ecotag"
 
 
 def addOptions(parser):
@@ -31,10 +31,9 @@ def addOptions(parser):
     group.add_argument('--threshold','-t',
                       action="store", dest="build_ref_db:threshold",
                       metavar='<THRESHOLD>',
-                      default=0.0,
+                      default=0.99,
                       type=float,
-                      help="Score threshold as a normalized identity, e.g. 0.95 for an identity of 95%%. Default: 0.00"
-                           " (no threshold).")
+                      help="Score threshold as a normalized identity, e.g. 0.95 for an identity of 95%%. Default: 0.99.")
 
 
 def run(config):

python/obitools3/commands/cat.pyx

@@ -22,7 +22,7 @@ import sys
 from cpython.exc cimport PyErr_CheckSignals
 
 
-__title__="Concatenate views."
+__title__="Concatenate views"
 
  
 def addOptions(parser):
@@ -97,7 +97,7 @@ def run(config):
             Column.new_column(o_view, REVERSE_QUALITY_COLUMN, OBI_QUAL, associated_column_name=REVERSE_SEQUENCE_COLUMN, associated_column_version=o_view[REVERSE_SEQUENCE_COLUMN].version)
         
     # Initialize multiple elements columns
-    if type(output_0)==BufferedWriter: 
+    if type(output_0)!=BufferedWriter: 
         dict_cols = {}
         for v_uri in config["cat"]["views_to_cat"]:
             v = open_uri(v_uri)[1]
@@ -115,7 +115,7 @@ def run(config):
             v.close()            
         for coln in dict_cols:
             Column.new_column(o_view, coln, dict_cols[coln]['obitype'], 
-                              nb_elements_per_line=dict_cols[coln]['nbelts'], elements_names=list(dict_cols[coln]['eltnames']))
+                              nb_elements_per_line=dict_cols[coln]['nbelts'], elements_names=list(dict_cols[coln]['eltnames']), dict_column=True)
     
     # Initialize the progress bar
     if not config['obi']['noprogressbar']:

python/obitools3/commands/clean.pyx

@@ -54,11 +54,11 @@ def addOptions(parser):
                        default=False,
                        help="Only sequences labeled as heads are kept in the output. Default: False")
 
-    group.add_argument('--cluster-tags', '-C',
-                       action="store_true", 
-                       dest="clean:cluster-tags",
-                       default=False,
-                       help="Adds tags for each sequence giving its cluster's head and weight for each sample.")
+#    group.add_argument('--cluster-tags', '-C',
+#                       action="store_true", 
+#                       dest="clean:cluster-tags",
+#                       default=False,
+#                       help="Adds tags for each sequence giving its cluster's head and weight for each sample.")
 
     group.add_argument('--thread-count','-p',   # TODO should probably be in a specific option group
                        action="store", dest="clean:thread-count",
@@ -143,3 +143,4 @@ def run(config):
     i_dms.close(force=True)
 
     logger("info", "Done.")
+    

python/obitools3/commands/count.pyx

@@ -10,7 +10,7 @@ from obitools3.dms.capi.obiview cimport COUNT_COLUMN
 from cpython.exc cimport PyErr_CheckSignals
 
 
-__title__="Counts sequence records"
+__title__="Count sequence records"
 
  
 def addOptions(parser):
@@ -29,6 +29,12 @@ def addOptions(parser):
                         default=False,
                         help="Prints only the total count of sequence records (if a sequence has no `count` attribute, its default count is 1) (default: False).")
 
+    group.add_argument('-c','--count-tag',
+                        action="store", dest="count:countcol",
+                        default='COUNT',
+                        type=str,
+                        help="Name of the tag/column associated with the count information (default: COUNT).")
+
     
 def run(config):
     
@@ -42,17 +48,19 @@ def run(config):
         raise Exception("Could not read input")
     entries = input[1]
     
+    countcol = config['count']['countcol'] 
+    
     count1 = len(entries)
     count2 = 0
     
-    if COUNT_COLUMN in entries and ((config['count']['sequence'] == config['count']['all']) or (config['count']['all'])) :
+    if countcol in entries and ((config['count']['sequence'] == config['count']['all']) or (config['count']['all'])) :
         for e in entries:
             PyErr_CheckSignals()
-            count2+=e[COUNT_COLUMN]
+            count2+=e[countcol]
 
-    if COUNT_COLUMN in entries and (config['count']['sequence'] == config['count']['all']):
+    if countcol in entries and (config['count']['sequence'] == config['count']['all']):
         print(count1,count2)
-    elif COUNT_COLUMN in entries and config['count']['all']:
+    elif countcol in entries and config['count']['all']:
         print(count2)
     else:
         print(count1)

python/obitools3/commands/grep.pyx

@@ -258,6 +258,13 @@ def Filter_generator(options, tax_filter, i_view):
 
 
 def Taxonomy_filter_generator(taxo, options):
+    
+    if (("required_ranks" in options and options["required_ranks"]) or \
+       ("required_taxids" in options and options["required_taxids"]) or \
+       ("ignored_taxids" in options and options["ignored_taxids"])) and \
+       (taxo is None):
+        raise RollbackException("obi grep error: can't use taxonomy options without providing a taxonomy. Rollbacking view")
+    
     if taxo is not None:
         def tax_filter(seq):
             good = True

python/obitools3/commands/head.pyx

@@ -16,7 +16,7 @@ from io import BufferedWriter
 from cpython.exc cimport PyErr_CheckSignals
 
 
-__title__="Keep the N first lines of a view."
+__title__="Keep the N first lines of a view"
 
  
 def addOptions(parser):

python/obitools3/commands/import.pyx

@@ -34,14 +34,17 @@ from obitools3.dms.capi.obidms cimport obi_import_view
 from obitools3.dms.capi.obitypes cimport obitype_t, \
                                          OBI_VOID, \
                                          OBI_QUAL, \
-                                         OBI_STR
+                                         OBI_STR, \
+                                         OBI_INT
 
 from obitools3.dms.capi.obierrno cimport obi_errno
 
 from obitools3.apps.optiongroups import addImportInputOption, \
                                         addTabularInputOption, \
                                         addTaxdumpInputOption, \
-                                        addMinimalOutputOption
+                                        addMinimalOutputOption, \
+                                        addNoProgressBarOption, \
+                                        addTaxonomyOption
 
 from obitools3.uri.decode import open_uri
 
@@ -50,9 +53,10 @@ from obitools3.apps.config import logger
 from cpython.exc cimport PyErr_CheckSignals
 
 from io import BufferedWriter
+import ast
 
 
-__title__="Imports sequences from different formats into a DMS"
+__title__="Import sequences from different formats into a DMS"
  
  
 default_config = {   'destview'     : None,
@@ -69,7 +73,9 @@ def addOptions(parser):
     addImportInputOption(parser)
     addTabularInputOption(parser)
     addTaxdumpInputOption(parser)
+    addTaxonomyOption(parser)
     addMinimalOutputOption(parser)
+    addNoProgressBarOption(parser)
 
     group = parser.add_argument_group('obi import specific options')
 
@@ -85,6 +91,10 @@ def addOptions(parser):
                      help="If importing a view into another DMS, do it by importing each line, saving disk space if the original view "
                           "has a line selection associated.")
 
+#    group.add_argument('--only-id',
+#                     action="store", dest="import:onlyid",
+#                     help="only id")
+
 def run(config):
     
     cdef   tuple       input
@@ -97,6 +107,7 @@ def run(config):
     cdef   bint        get_quality
     cdef   bint        NUC_SEQS_view
     cdef   bint        silva
+    cdef   bint        rdp
     cdef   int         nb_elts
     cdef   object      d
     cdef   View        view
@@ -180,6 +191,16 @@ def run(config):
         logger("info", "Done.")
         return
 
+    # Open taxonomy if there is one
+    if 'taxoURI' in config['obi'] and config['obi']['taxoURI'] is not None:
+        taxo_uri = open_uri(config['obi']['taxoURI'])
+        if taxo_uri is None or taxo_uri[2] == bytes:
+            raise Exception("Couldn't open taxonomy")
+        taxo = taxo_uri[1]
+
+    else :
+        taxo = None
+
     # If importing a view between two DMS and not wanting to save space if line selection in original view, use C API
     if isinstance(input[1], View) and not config['import']['space_priority']:
         if obi_import_view(input[0].name_with_full_path, o_dms.name_with_full_path, input[1].name, tobytes((config['obi']['outputURI'].split('/'))[-1])) < 0 :
@@ -192,8 +213,11 @@ def run(config):
         logger("info", "Done.")
         return
 
-    if entry_count >= 0:
+    # Reinitialize the progress bar
+    if entry_count >= 0 and config['obi']['noprogressbar'] == False:
         pb = ProgressBar(entry_count, config)
+    else:
+        pb = None
         
     NUC_SEQS_view = False
     if isinstance(output[1], View) :
@@ -209,12 +233,17 @@ def run(config):
         def_col = view[DEFINITION_COLUMN]
         seq_col = view[NUC_SEQUENCE_COLUMN]
 
-    # Prepare taxon scientific name if SILVA file
-    if 'inputformat' in config['obi'] and config['obi']['inputformat'] == b"silva":
-        silva = True
-        sci_name_col = Column.new_column(view, SCIENTIFIC_NAME_COLUMN, OBI_STR)
-    else:
+    # Prepare taxon scientific name and taxid refs if RDP or SILVA file
     silva = False
+    rdp = False
+    if 'inputformat' in config['obi'] and (config['obi']['inputformat'] == b"silva" or config['obi']['inputformat'] == b"rdp"):
+        #if taxo is None:
+        #    raise Exception("A taxonomy (as built by 'obi import --taxdump') must be provided for SILVA and RDP files")
+        silva = True
+        rdp = True
+        if taxo is not None:
+            sci_name_col = Column.new_column(view, SCIENTIFIC_NAME_COLUMN, OBI_STR)
+            taxid_col = Column.new_column(view, TAXID_COLUMN, OBI_INT)
 
     dcols = {}
 
@@ -257,15 +286,21 @@ def run(config):
         for tag in dict_dict:
             dcols[tag] = (Column.new_column(view, tag, dict_dict[tag][1], \
                               nb_elements_per_line=len(dict_dict[tag][0]), \
-                              elements_names=list(dict_dict[tag][0])), \
+                              elements_names=list(dict_dict[tag][0]), \
+                              dict_column=True), \
                           dict_dict[tag][1])
     
         
         # Reinitialize the input
         if isinstance(input[0], CompressedFile):
             input_is_file = True
-        if entry_count >= 0:
+        
+        # Reinitialize the progress bar
+        if entry_count >= 0 and config['obi']['noprogressbar'] == False:
             pb = ProgressBar(entry_count, config)
+        else:
+            pb = None
+
         try:
             input[0].close()
         except AttributeError:
@@ -274,6 +309,11 @@ def run(config):
         if input is None:
             raise Exception("Could not open input URI")
     
+#    if 'onlyid' in config['import']:
+#        onlyid = tobytes(config['import']['onlyid'])
+#    else:
+#        onlyid = None
+    
     entries = input[1]
     i = 0
     for entry in entries :
@@ -291,6 +331,9 @@ def run(config):
         elif not i%50000:
             logger("info", "Imported %d entries", i)
         
+#        if onlyid is not None and entry.id != onlyid:
+#            continue
+        
         try:
              
             if NUC_SEQS_view: 
@@ -306,10 +349,17 @@ def run(config):
                 if get_quality:
                     qual_col[i] = entry.quality
                     
-                # Parse taxon scientific name if SILVA file
-                if silva:
-                    sci_name = entry.definition.split(b";")[-1]
-                    sci_name_col[i] = sci_name
+                # Parse taxon scientific name if RDP file
+                if (rdp or silva) and taxo is not None:
+                    sci_names = entry.definition.split(b";")
+                    for sci_name in reversed(sci_names):
+                        if sci_name.split()[0] != b'unidentified' and sci_name.split()[0] != b'uncultured' and sci_name.split()[0] != b'metagenome' :
+                            taxon = taxo.get_taxon_by_name(sci_name)
+                            if taxon is not None:
+                                sci_name_col[i] = taxon.name
+                                taxid_col[i] = taxon.taxid
+                                #print(taxid_col[i], sci_name_col[i])
+                                break
 
             for tag in entry :
                 
@@ -323,27 +373,40 @@ def run(config):
                     if tag[:7] == b"merged_":
                         tag = MERGED_PREFIX+tag[7:]
 
+                    if type(value) == bytes and value[:1]==b"[" :
+                        try:
+                            if type(eval(value)) == list:
+                                value = eval(value)
+                                #print(value)
+                        except:
+                            pass
+                    
                     if tag not in dcols :
                                                 
                         value_type = type(value)
                         nb_elts = 1
                         value_obitype = OBI_VOID
+                        dict_col = False
                         
-                        if value_type == dict or value_type == list :
+                        if value_type == dict :
                             nb_elts = len(value)
                             elt_names = list(value)
+                            dict_col = True
                         else :
                             nb_elts = 1
                             elt_names = None
                         
+                        if value_type == list :
+                            tuples = True
+                        else:
+                            tuples = False
+                        
                         value_obitype = get_obitype(value)
                                                 
                         if value_obitype != OBI_VOID :
-                            dcols[tag] = (Column.new_column(view, tag, value_obitype, nb_elements_per_line=nb_elts, elements_names=elt_names), value_obitype)
+                            dcols[tag] = (Column.new_column(view, tag, value_obitype, nb_elements_per_line=nb_elts, elements_names=elt_names, dict_column=dict_col, tuples=tuples), value_obitype)
                                                      
                             # Fill value
-                            if value_type == dict and nb_elts == 1:  # special case that makes the OBI3 create a 1 elt/line column which won't read a dict value
-                                value = value[list(value.keys())[0]]       # The solution is to transform the value in a simple atomic one acceptable by the column
                             dcols[tag][0][i] = value
                          
                         # TODO else log error?
@@ -369,7 +432,7 @@ def run(config):
                             # Fill value
                             dcols[tag][0][i] = value
                          
-                        except IndexError :
+                        except (IndexError, OverflowError):
                                                                                  
                             value_type = type(value)
                             old_column = dcols[tag][0]
@@ -417,18 +480,19 @@ def run(config):
                                 dcols[tag][0][i] = value
         
         except Exception as e:
-            print("\nCould not import sequence id:", entry.id, "(error raised:", e, ")")
+            print("\nCould not import sequence:", repr(entry), "(error raised:", e, ")")
             if 'skiperror' in config['obi'] and not config['obi']['skiperror']:
                 raise e
             else:
                 pass
+                i-=1  # overwrite problematic entry
         
         i+=1
  
     if pb is not None:
         pb(i, force=True)
         print("", file=sys.stderr)
-    logger("info", "Imported %d entries", i)
+    logger("info", "Imported %d entries", len(view))
     
     # Save command config in View and DMS comments
     command_line = " ".join(sys.argv[1:])

python/obitools3/commands/ngsfilter.pyx

@@ -24,11 +24,7 @@ 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"
+__title__="Assign sequence records to the corresponding experiment/sample based on DNA tags and primers"
 
 
 def addOptions(parser):
@@ -398,7 +394,7 @@ cdef tuple annotate(sequences, infos, no_tags, verbose=False):
             seq_to_match = sequences[0]
         reversematch = []
         # Compute begin
-        begin=directmatch[1][2]+1  # end of match + 1 on the same sequence
+        #begin=directmatch[1][2]+1  # end of match + 1 on the same sequence -- No, already cut out forward primer        
         # Try reverse matching on the other sequence:
         new_seq = True
         pattern = 0
@@ -412,7 +408,7 @@ cdef tuple annotate(sequences, infos, no_tags, verbose=False):
                 primer=p
             # Saving original primer as 4th member of the tuple to serve as correct key in infos dict even if it might have been reversed complemented
             # (3rd member already used by directmatch)
-            reversematch.append((primer, primer(seq_to_match, same_sequence=not new_seq, pattern=pattern, begin=begin), None, p))
+            reversematch.append((primer, primer(seq_to_match, same_sequence=not new_seq, pattern=pattern, begin=0), None, p))
             new_seq = False
             pattern+=1
         # Choose match closer to the end of the sequence
@@ -649,6 +645,7 @@ def run(config):
     
     g = 0
     u = 0
+    i = 0
     no_tags = config['ngsfilter']['notags']
     try:
         for i in range(entries_len):

python/obitools3/commands/rm.pyx

@@ -0,0 +1,44 @@
+#cython: language_level=3
+
+from obitools3.uri.decode import open_uri
+from obitools3.apps.config import logger
+from obitools3.dms import DMS
+from obitools3.apps.optiongroups import addMinimalInputOption
+from obitools3.dms.view.view cimport View
+import os
+ 
+__title__="Delete a view"
+
+
+def addOptions(parser):    
+    addMinimalInputOption(parser)
+
+def run(config):
+
+    DMS.obi_atexit()
+    
+    logger("info", "obi rm")
+
+    # Open the input
+    input = open_uri(config['obi']['inputURI'])
+    if input is None:
+        raise Exception("Could not read input")
+    
+    # Check that it's a view
+    if isinstance(input[1], View) :
+        view = input[1]
+    else: 
+        raise NotImplementedError()
+    
+    # Get the path to the view file to remove
+    path = input[0].full_path  # dms path
+    path+=b"/VIEWS/"
+    path+=view.name
+    path+=b".obiview"
+    
+    # Close the view and the DMS
+    view.close()
+    input[0].close(force=True)
+    
+    # Rm
+    os.remove(path)

python/obitools3/commands/sort.pyx

@@ -36,7 +36,7 @@ NULL_VALUE = {OBI_BOOL: OBIBool_NA,
               OBI_STR: b""}
  
 
-__title__="Sort view lines according to the value of a given attribute."
+__title__="Sort view lines according to the value of a given attribute"
 
  
 def addOptions(parser):

python/obitools3/commands/stats.pyx

@@ -16,7 +16,7 @@ import sys
 from cpython.exc cimport PyErr_CheckSignals
 
 
-__title__="Compute basic statistics for attribute values."
+__title__="Compute basic statistics for attribute values"
 
 '''
 `obi stats` computes basic statistics for attribute values of sequence records.
@@ -154,7 +154,7 @@ def run(config):
     else :
         taxo = None
 
-    statistics = set(config['stats']['minimum']) | set(config['stats']['maximum']) | set(config['stats']['mean'])
+    statistics = set(config['stats']['minimum']) | set(config['stats']['maximum']) | set(config['stats']['mean']) | set(config['stats']['var']) | set(config['stats']['sd'])
     total = 0
     catcount={}
     totcount={}
@@ -195,7 +195,7 @@ def run(config):
         except KeyError:
             totcount[category]=totcount.get(category,0)+1
         for var in statistics:
-            if var in line:
+            if var in line and line[var] is not None:
                 v = line[var]
                 if var not in values:
                     values[var]={}
@@ -238,14 +238,34 @@ def run(config):
     else:
         sdvar= "%s"
         
-    hcat = "\t".join([pcat % x for x in config['stats']['categories']]) + "\t" +\
-           "\t".join([minvar % x for x in config['stats']['minimum']])  + "\t" +\
-           "\t".join([maxvar % x for x in config['stats']['maximum']])  + "\t" +\
-           "\t".join([meanvar % x for x in config['stats']['mean']])  + "\t" +\
-           "\t".join([varvar % x for x in config['stats']['var']])  + "\t" +\
-           "\t".join([sdvar % x for x in config['stats']['sd']]) + \
-           "\t   count" + \
-           "\t   total" 
+    hcat = ""
+    
+    for x in config['stats']['categories']:
+        hcat += pcat % x
+        hcat += "\t"
+    
+    for x in config['stats']['minimum']:
+        hcat += minvar % x
+        hcat += "\t"
+
+    for x in config['stats']['maximum']:
+        hcat += maxvar % x
+        hcat += "\t"
+
+    for x in config['stats']['mean']:
+        hcat += meanvar % x
+        hcat += "\t"
+    
+    for x in config['stats']['var']:
+        hcat += varvar % x
+        hcat += "\t"
+
+    for x in config['stats']['sd']:
+        hcat += sdvar % x
+        hcat += "\t"
+
+    hcat += "count\ttotal" 
+    
     print(hcat)
     sorted_stats = sorted(catcount.items(), key = lambda kv:(totcount[kv[0]]), reverse=True)
     for i in range(len(sorted_stats)):

python/obitools3/commands/tail.pyx

@@ -15,7 +15,7 @@ from cpython.exc cimport PyErr_CheckSignals
 from io import BufferedWriter
 
 
-__title__="Keep the N last lines of a view."
+__title__="Keep the N last lines of a view"
 
  
 def addOptions(parser):

python/obitools3/commands/test.pyx

@@ -39,7 +39,7 @@ COL_COMMENTS_MAX_LEN = 2048
 MAX_INT = 2147483647    # used to generate random float values
  
  
-__title__="Tests if the obitools are working properly"
+__title__="Test if the obitools are working properly"
 
 
 default_config = {
@@ -301,8 +301,11 @@ def fill_column(config, infos, col) :
 def create_random_column(config, infos) :
     alias = random.choice([b'', random_unique_name(infos)])
     tuples = random.choice([True, False])
+    dict_column = False
     if not tuples :
         nb_elements_per_line=random.randint(1, config['test']['maxelts'])
+        if nb_elements_per_line > 1:
+            dict_column = True
         elements_names = []
         for i in range(nb_elements_per_line) :
             elements_names.append(random_unique_element_name(config, infos))
@@ -318,6 +321,7 @@ def create_random_column(config, infos) :
                                data_type, 
                                nb_elements_per_line=nb_elements_per_line,
                                elements_names=elements_names,
+                               dict_column=dict_column,
                                tuples=tuples,
                                comments=random_comments(config),
                                alias=alias
@@ -442,7 +446,7 @@ def addOptions(parser):
                        default=20,
                        type=int,
                        help="Maximum length of tuples. "
-                            "Default: 50")
+                            "Default: 20")
   
     group.add_argument('--max_ini_col_count','-o',
                        action="store", dest="test:maxinicolcount",
@@ -455,7 +459,7 @@ def addOptions(parser):
     group.add_argument('--max_line_nb','-l',
                        action="store", dest="test:maxlinenb",
                        metavar='<MAX_LINE_NB>',
-                       default=10000,
+                       default=1000,
                        type=int,
                        help="Maximum number of lines in a column. "
                             "Default: 1000")

python/obitools3/commands/uniq.pyx

@@ -354,8 +354,8 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di
         key = mergedKeys[k]
         merged_col_name = mergedKeys_m[k]
         
-        if merged_infos[merged_col_name]['nb_elts'] == 1:
-            raise Exception("Can't merge information from a tag with only one element (e.g. one sample ; don't use -m option)")
+#        if merged_infos[merged_col_name]['nb_elts'] == 1:
+#            raise Exception("Can't merge information from a tag with only one element (e.g. one sample ; don't use -m option)")
         
         if merged_col_name in view:
             i_col = view[merged_col_name]
@@ -378,6 +378,7 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di
                               OBI_INT,
                               nb_elements_per_line=merged_infos[merged_col_name]['nb_elts'],
                               elements_names=list(merged_infos[merged_col_name]['elt_names']),
+                              dict_column=True,
                               comments=i_col.comments,
                               alias=merged_col_name
                              )
@@ -400,6 +401,7 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di
                               OBI_INT,
                               nb_elements_per_line=len(view),
                               elements_names=[id for id in i_id_col],
+                              dict_column=True,
                               alias=TAXID_DIST_COLUMN
                              )
 

python/obitools3/dms/capi/obidmscolumn.pxd

@@ -31,6 +31,7 @@ cdef extern from "obidmscolumn.h" nogil:
         const_char_p        elements_names
         OBIType_t           returned_data_type
         OBIType_t           stored_data_type
+        bint                dict_column
         bint                tuples
         bint                to_eval
         time_t              creation_date

python/obitools3/dms/capi/obitypes.pxd

@@ -54,6 +54,8 @@ cdef extern from "obitypes.h" nogil:
     extern uint8_t*      OBIQual_int_NA
     extern void*         OBITuple_NA
     
+    extern obiint_t      OBI_INT_MAX
+
     const_char_p name_data_type(int data_type)
 
 ctypedef OBIType_t obitype_t

python/obitools3/dms/capi/obiview.pxd

@@ -95,6 +95,7 @@ cdef extern from "obiview.h" nogil:
                             index_t nb_elements_per_line,
                             char* elements_names,
                             bint  elt_names_formatted,
+                            bint dict_column,
                             bint tuples,
                             bint to_eval,
                             const_char_p indexer_name,

python/obitools3/dms/column/column.pyx

@@ -90,6 +90,7 @@ cdef class Column(OBIWrapper) :
                    obitype_t data_type,
                    index_t   nb_elements_per_line=1,
                    list      elements_names=None,
+                   bint      dict_column=False,
                    bint      tuples=False,
                    bint      to_eval=False,
                    object    associated_column_name=b"",
@@ -152,6 +153,7 @@ cdef class Column(OBIWrapper) :
                                 nb_elements_per_line      = nb_elements_per_line,
                                 elements_names            = elements_names_p,
                                 elt_names_formatted       = False,
+                                dict_column               = dict_column,
                                 tuples                    = tuples,
                                 to_eval                   = to_eval,
                                 indexer_name              = NULL,
@@ -200,7 +202,7 @@ cdef class Column(OBIWrapper) :
         
         column_p = column_pp[0]
         column_type = column_p.header.returned_data_type
-        column_class = Column.get_column_class(column_type, (column_p.header.nb_elements_per_line > 1), column_p.header.tuples)
+        column_class = Column.get_column_class(column_type, (column_p.header.nb_elements_per_line > 1 or column_p.header.dict_column == True), column_p.header.tuples)
         column = OBIWrapper.new_wrapper(column_class, column_pp)
         
         column._view = view
@@ -236,6 +238,7 @@ cdef class Column(OBIWrapper) :
                                 nb_elements_per_line      = -1,
                                 elements_names            = NULL,
                                 elt_names_formatted       = False,
+                                dict_column               = False,
                                 tuples                    = False,
                                 to_eval                   = False,
                                 indexer_name              = NULL,
@@ -374,6 +377,13 @@ cdef class Column(OBIWrapper) :
             raise OBIDeactivatedInstanceError()
         return self.pointer().header.nb_elements_per_line
  
+    # dict_column property getter
+    @property
+    def dict_column(self):
+        if not self.active() :
+            raise OBIDeactivatedInstanceError()
+        return self.pointer().header.dict_column
+ 
     # data_type property getter
     @property
     def data_type(self):

python/obitools3/dms/column/typed_column/bool.pyx

@@ -38,11 +38,13 @@ cdef class Column_bool(Column):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             bint    tuples=False,
             object  comments={}):
         return Column.new_column(view, column_name, OBI_BOOL,
                           nb_elements_per_line=nb_elements_per_line, 
                           elements_names=elements_names,
+                          dict_column=dict_column, 
                           tuples=tuples,
                           comments=comments)
                 

python/obitools3/dms/column/typed_column/char.pyx

@@ -36,12 +36,14 @@ cdef class Column_char(Column):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             bint    tuples=False,
             object  comments={}):
         
         return Column.new_column(view, column_name, OBI_CHAR,
                                  nb_elements_per_line=nb_elements_per_line, 
                                  elements_names=elements_names, 
+                                 dict_column=dict_column, 
                                  tuples=tuples,
                                  comments=comments)
 

python/obitools3/dms/column/typed_column/float.pyx

@@ -36,12 +36,14 @@ cdef class Column_float(Column):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             bint    tuples=False,
             object  comments={}):
         
         return Column.new_column(view, column_name, OBI_FLOAT,
                                  nb_elements_per_line=nb_elements_per_line, 
                                  elements_names=elements_names, 
+                                 dict_column=dict_column, 
                                  tuples=tuples,
                                  comments=comments)
 

python/obitools3/dms/column/typed_column/int.pyx

@@ -38,12 +38,14 @@ cdef class Column_int(Column):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             bint    tuples=False,
             object  comments={}):
         
         return Column.new_column(view, column_name, OBI_INT,
                                  nb_elements_per_line=nb_elements_per_line, 
                                  elements_names=elements_names, 
+                                 dict_column=dict_column, 
                                  tuples=tuples,
                                  comments=comments)
 

python/obitools3/dms/column/typed_column/qual.pyx

@@ -38,6 +38,7 @@ cdef class Column_qual(Column_idx):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             object  associated_column_name=b"",
             int     associated_column_version=-1,
             object  comments={}):
@@ -45,6 +46,7 @@ cdef class Column_qual(Column_idx):
         return Column.new_column(view, column_name, OBI_QUAL,
                                  nb_elements_per_line=nb_elements_per_line, 
                                  elements_names=elements_names, 
+                                 dict_column=dict_column, 
                                  tuples=False,
                                  associated_column_name=associated_column_name,
                                  associated_column_version=associated_column_name,

python/obitools3/dms/column/typed_column/seq.pyx

@@ -39,12 +39,14 @@ cdef class Column_seq(Column_idx):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             bint    tuples=False,
             object  comments={}):
         
         return Column.new_column(view, column_name, OBI_SEQ,
                                  nb_elements_per_line=nb_elements_per_line, 
                                  elements_names=elements_names, 
+                                 dict_column=dict_column, 
                                  tuples=tuples,
                                  comments=comments)
 

python/obitools3/dms/column/typed_column/str.pyx

@@ -38,12 +38,14 @@ cdef class Column_str(Column_idx):
             object  column_name,
             index_t nb_elements_per_line=1,
             object  elements_names=None,
+            bint    dict_column=False,
             bint    tuples=False,
             object  comments={}):
         
         return Column.new_column(view, column_name, OBI_STR,
                                  nb_elements_per_line=nb_elements_per_line, 
                                  elements_names=elements_names, 
+                                 dict_column=dict_column, 
                                  tuples=tuples,
                                  comments=comments)
 

python/obitools3/dms/view/view.pyx

@@ -77,7 +77,7 @@ cdef class View(OBIWrapper) :
  
  
     @staticmethod
-    def import_view(object dms_1, object dms_2, object view_name_1, object view_name_2):
+    def import_view(object dms_1, object dms_2, object view_name_1, object view_name_2): # TODO argument to import line by line to avoid huge AVL copy
         if obi_import_view(tobytes(dms_1), tobytes(dms_2), tobytes(view_name_1), tobytes(view_name_2)) < 0 :
             raise Exception("Error importing a view")
 
@@ -343,7 +343,7 @@ cdef class View(OBIWrapper) :
 
         new_column = Column.new_column(self, old_column.pointer().header.name, new_data_type, 
                                        nb_elements_per_line=new_nb_elements_per_line, elements_names=new_elements_names, 
-                                       comments=old_column.comments, alias=column_name_b+tobytes('___new___'))
+                                       dict_column=(new_nb_elements_per_line>1), comments=old_column.comments, alias=column_name_b+tobytes('___new___'))
         
         switch_to_dict = old_column.nb_elements_per_line == 1 and new_nb_elements_per_line > 1
         ori_key = old_column._elements_names[0]
@@ -404,6 +404,7 @@ cdef class View(OBIWrapper) :
                                   col.data_type_int, 
                                   nb_elements_per_line = col.nb_elements_per_line,
                                   elements_names = col._elements_names,
+                                  dict_column = col.dict_column,
                                   tuples = col.tuples,
                                   to_eval = col.to_eval,
                                   comments = col.comments,
@@ -599,7 +600,8 @@ cdef class View(OBIWrapper) :
                 if element is not None:
                     if element.comments[b"input_dms_name"] is not None :
                         for i in range(len(element.comments[b"input_dms_name"])) :
-                            if element.comments[b"input_dms_name"][i] == element.dms.name and b"/" not in element.comments[b"input_view_name"][i]:  # Same DMS and not a special element like a taxonomy
+                            if b"/" not in element.comments[b"input_view_name"][i] and element.comments[b"input_view_name"][i] in element.dms \
+                            and element.comments[b"input_dms_name"][i] == element.dms.name :  # Same DMS and not a special element like a taxonomy and view was not deleted
                                 top_level.append(element.dms[element.comments[b"input_view_name"][i]])
                             else:
                                 top_level.append(None)
@@ -805,7 +807,7 @@ cdef class Line :
 
 
     def __repr__(self):
-        return bytes2str(self).repr_bytes()
+        return bytes2str(self.repr_bytes())
 
 
     cpdef repr_bytes(self):

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/parsers/tab.pyx

@@ -8,7 +8,7 @@ Created on feb 20th 2018
 
 import types
 from obitools3.utils cimport __etag__
-
+from obitools3.utils cimport str2bytes
 
 def tabIterator(lineiterator, 
                 bint header = False,
@@ -75,7 +75,7 @@ def tabIterator(lineiterator,
                 continue
             else:
                 # TODO ??? default column names? like R?
-                keys = [i for i in range(len(line.split(sep)))]
+                keys = [str2bytes(str(i)) for i in range(len(line.split(sep)))]
                 
         while skipped < skip :
             line = next(iterator)

python/obitools3/parsers/universal.pyx

@@ -53,7 +53,11 @@ def entryIteratorFactory(lineiterator,
 
     i = iterator
         
+    try:
         first=next(i)
+    except StopIteration:
+        first=""
+        pass
 
     format=b"tabular"
     

python/obitools3/uri/decode.pyx

@@ -210,11 +210,12 @@ def open_uri(uri,
     
     error = None
         
-    if urib != b"-" and \
+    if b'/taxonomy/' in urib or \
+        (urib != b"-" and \
         (scheme==b"dms" or \
          (scheme==b"" and \
           (((not input) and "outputformat" not in config["obi"]) or \
-          (input and "inputformat" not in config["obi"])))):   # TODO maybe not best way
+          (input and "inputformat" not in config["obi"]))))):   # TODO maybe not best way
                 
         if default_dms is not None and b"/" not in urip.path:   # assuming view to open in default DMS (TODO discuss)
             dms=(default_dms, urip.path)
@@ -464,7 +465,7 @@ def open_uri(uri,
         if format is not None:
             if seqtype==b"nuc":
                 objclass = Nuc_Seq    # Nuc_Seq_Stored? TODO
-                if format==b"fasta" or format==b"silva":
+                if format==b"fasta" or format==b"silva" or format==b"rdp":
                     if input:
                         iseq = fastaNucIterator(file, 
                                                 skip=skip, 
@@ -565,6 +566,6 @@ def open_uri(uri,
         
         entry_count = -1
         if input:
-            entry_count = count_entries(file, format)
+            entry_count = count_entries(file, format, header)
         
         return (file, iseq, objclass, urib, entry_count)

python/obitools3/utils.pxd

@@ -3,7 +3,7 @@
 from obitools3.dms.capi.obitypes cimport obitype_t, index_t
 
 cpdef bytes format_uniq_pattern(bytes format)
-cpdef int count_entries(file, bytes format)
+cpdef int count_entries(file, bytes format, bint header)
 
 cdef obi_errno_to_exception(index_t line_nb=*, object elt_id=*, str error_message=*)
 
@@ -18,7 +18,7 @@ cdef object clean_empty_values_from_object(object value, exclude=*)
 
 cdef obitype_t get_obitype_single_value(object value)
 cdef obitype_t update_obitype(obitype_t obitype, object new_value)
-cdef obitype_t get_obitype_iterable_value(object value)
+cdef obitype_t get_obitype_iterable_value(object value, type t)
 cdef obitype_t get_obitype(object value)
 
 cdef object __etag__(bytes x, bytes nastring=*)

python/obitools3/utils.pyx

@@ -9,7 +9,8 @@ from obitools3.dms.capi.obitypes cimport is_a_DNA_seq, \
                                          OBI_QUAL, \
                                          OBI_SEQ, \
                                          OBI_STR, \
-                                         index_t
+                                         index_t, \
+                                         OBI_INT_MAX
 
 from obitools3.dms.capi.obierrno cimport OBI_LINE_IDX_ERROR, \
                                          OBI_ELT_IDX_ERROR, \
@@ -39,7 +40,7 @@ cpdef bytes format_uniq_pattern(bytes format):
         return None
 
 
-cpdef int count_entries(file, bytes format):
+cpdef int count_entries(file, bytes format, bint header):
     
     try:
         sep = format_uniq_pattern(format)
@@ -74,6 +75,8 @@ cpdef int count_entries(file, bytes format):
             total_count += len(re.findall(sep, mmapped_file))
             if format != b"ngsfilter" and format != b"tabular" and format != b"embl" and format != b"genbank" and format != b"fastq":
                 total_count += 1 # adding +1 for 1st entry because separators include \n (ngsfilter and tabular already count one more because of last \n)
+            if format == b"tabular" and header: # not counting header as an entry
+                total_count -= 1
             
     except:
         if len(files) > 1:
@@ -257,38 +260,51 @@ cdef obitype_t update_obitype(obitype_t obitype, object new_value) :
     
     new_type = type(new_value)
     
-    if obitype == OBI_INT :
-        if new_type == float :
-            return OBI_FLOAT
+    #if new_type == NoneType:  # doesn't work because Cython sucks
+    if new_value == None or new_type==list or new_type==dict or new_type==tuple:
+        return obitype
+    
     # TODO BOOL vers INT/FLOAT
-    elif new_type == str or new_type == bytes :
+    if new_type == str or new_type == bytes :
         if obitype == OBI_SEQ and is_a_DNA_seq(tobytes(new_value)) :
             pass
         else :
             return OBI_STR
+    elif obitype == OBI_INT :
+        if new_type == float or new_value > OBI_INT_MAX :
+            return OBI_FLOAT
         
     return obitype
 
 
-cdef obitype_t get_obitype_iterable_value(object value) :
+cdef obitype_t get_obitype_iterable_value(object value, type t) :
     
     cdef obitype_t value_obitype
     
     value_obitype = OBI_VOID
     
+    if t == dict:
         for k in value :
             if value_obitype == OBI_VOID :
                 value_obitype = get_obitype_single_value(value[k])
             else :
                 value_obitype = update_obitype(value_obitype, value[k])
     
+    elif t == list or t == tuple:
+        for v in value :
+            if value_obitype == OBI_VOID :
+                value_obitype = get_obitype_single_value(v)
+            else :
+                value_obitype = update_obitype(value_obitype, v)
+    
     return value_obitype
 
 
 cdef obitype_t get_obitype(object value) :
     
-    if type(value) == dict or type(value) == list or type(value) == tuple :
-        return get_obitype_iterable_value(value)
+    t = type(value)
+    if t == dict or t == list or t == tuple :
+        return get_obitype_iterable_value(value, t)
     
     else :
         return get_obitype_single_value(value)

python/obitools3/version.py

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

src/build_reference_db.c

@@ -243,6 +243,7 @@ int build_reference_db(const char* dms_name,
 							false,
 							false,
 							false,
+							false,
 							"",
 							"",
 							-1,
@@ -392,6 +393,7 @@ int build_reference_db(const char* dms_name,
 							1,
 							"",
 							false,
+							false,
 							true,
 							false,
 							"",
@@ -415,6 +417,7 @@ int build_reference_db(const char* dms_name,
 							1,
 							"",
 							false,
+							false,
 							true,
 							false,
 							"",
@@ -860,7 +863,8 @@ int build_reference_db(const char* dms_name,
 	fprintf(stderr,"\rDone : 100 %%           \n");
 
 	// Add information about the threshold used to build the DB
-	snprintf(threshold_str, 5, "%f", threshold);
+#define snprintf_nowarn(...) (snprintf(__VA_ARGS__) < 0 ? abort() : (void)0)
+	snprintf_nowarn(threshold_str, 5, "%f", threshold);
 
 	new_comments = obi_add_comment((o_view->infos)->comments, DB_THRESHOLD_KEY_IN_COMMENTS, threshold_str);
 	if (new_comments == NULL)

src/kmer_similarity.c

@@ -77,7 +77,6 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	int32_t*        shift_count_array;
 	Obi_ali_p       ali = NULL;
 	int 			i, j;
-	bool 			switched_seqs;
 	bool			reversed;
 	int 			score = 0;
 	Obi_blob_p      blob1 = NULL;
@@ -124,6 +123,8 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	bool			keep_seq2_start;
 	bool			keep_seq1_end;
 	bool			keep_seq2_end;
+	bool			left_ali;
+	bool 			rev_quals = false;
 
 	// Check kmer size
 	if ((kmer_size < 1) || (kmer_size > 4))
@@ -148,19 +149,8 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	}
 
 	// Choose the shortest sequence to save kmer positions in array
-	switched_seqs = false;
 	len1 = blob1->length_decoded_value;
 	len2 = blob2->length_decoded_value;
-	if (len2 < len1)
-	{
-		switched_seqs = true;
-		temp_len = len1;
-		len1 = len2;
-		len2 = temp_len;
-		temp_blob = blob1;
-		blob1 = blob2;
-		blob2 = temp_blob;
-	}
 
 	// Force encoding on 2 bits by replacing ambiguous nucleotides by 'a's
 	if (blob1->element_size == 4)
@@ -196,7 +186,47 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	else
 		reversed = false;
 	if (reversed)
-		switched_seqs = !switched_seqs;
+		// unreverse to make cases simpler. Costly but rare (direct match is reverse primer match)
+	{
+		if (seq2 == NULL)
+			seq2 = obi_blob_to_seq(blob2);
+		seq2 = reverse_complement_sequence(seq2);
+		blob2 = obi_seq_to_blob(seq2);
+
+		if (seq1 == NULL)
+			seq1 = obi_blob_to_seq(blob1);
+		seq1 = reverse_complement_sequence(seq1);
+		blob1 = obi_seq_to_blob(seq1);
+		free_blob1 = true;
+
+		// Get the quality arrays
+		qual1 = obi_get_qual_int_with_elt_idx_and_col_p_in_view(view1, qual_col1, idx1, 0, &qual1_len);
+		if (qual1 == NULL)
+		{
+			obidebug(1, "\nError getting the quality of the 1st sequence when computing the kmer similarity between two sequences");
+			return NULL;
+		}
+		qual2 = obi_get_qual_int_with_elt_idx_and_col_p_in_view(view2, qual_col2, idx2, 0, &qual2_len);
+		if (qual2 == NULL)
+		{
+			obidebug(1, "\nError getting the quality of the 2nd sequence when computing the kmer similarity between two sequences");
+			return NULL;
+		}
+
+		uint8_t* newqual1 = malloc(qual1_len*sizeof(uint8_t));
+		uint8_t* newqual2 = malloc(qual2_len*sizeof(uint8_t));
+
+		for (i=0;i<qual1_len;i++)
+			newqual1[i] = qual1[qual1_len-1-i];
+
+		for (i=0;i<qual2_len;i++)
+			newqual2[i] = qual2[qual2_len-1-i];
+
+		qual1 = newqual1;
+		qual2 = newqual2;
+
+		rev_quals = true;
+	}
 
 	// Save total length for the shift counts array
 	total_len = len1 + len2 + 1;   // +1 for shift 0
@@ -237,7 +267,7 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 		 	return NULL;
 		}
 	}
-	else if (len1 >= shift_array_height)
+	else if (total_len >= shift_array_height)
 	{
 		shift_array_height = total_len;
 		*shift_array_p = (int32_t*) realloc(*shift_array_p, ARRAY_LENGTH * shift_array_height * sizeof(int32_t));
@@ -291,7 +321,7 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	*shift_array_height_p = shift_array_height;
 	*shift_count_array_length_p = shift_count_array_length;
 
-	// Fill array with positions of kmers in the shortest sequence
+	// Fill array with positions of kmers in the first sequence
 	encoding = blob1->element_size;
 	kmer_count = len1 - kmer_size + 1;
 	for (kmer_idx=0; kmer_idx < kmer_count; kmer_idx++)
@@ -310,7 +340,7 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 		kmer_pos_array[(kmer*kmer_pos_array_height)+i] = kmer_idx;
 	}
 
-	// Compare positions of kmers between both sequences and store shifts
+	// Compare positions of kmers between both sequences and store shifts (a shift corresponds to pos2 - pos1)
 	kmer_count = blob2->length_decoded_value - kmer_size + 1;
 	for (kmer_idx=0; kmer_idx < kmer_count; kmer_idx++)
 	{
@@ -374,35 +404,42 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	// The 873863 cases of hell
 	if (best_shift > 0)
 	{
+		left_ali = false;
 		overlap_len = len2 - best_shift;
 		if (len1 <= overlap_len)
 		{
 			overlap_len = len1;
-			if (! switched_seqs)
 			keep_seq2_end = true;
-			else
-				keep_seq2_start = true;
-		}
-		else if (switched_seqs)
-		{
-			keep_seq2_start = true;
-			keep_seq1_end = true;
 		}
 	}
 	else if (best_shift < 0)
 	{
+		left_ali = true;
 	    overlap_len = len1 + best_shift;
-	    if (!switched_seqs)
+		if (len2 <= overlap_len)
+		{
+			overlap_len = len2;
+			keep_seq1_start = true;
+		}
+		else
 		{
 			keep_seq1_start = true;
 			keep_seq2_end = true;
 		}
 	}
-	else
+	else // if (best_shift == 0)
+	{
+		if (len2 >= len1)
 		{
 			overlap_len = len1;
-		if ((!switched_seqs) && (len2 > len1))
 			keep_seq2_end = true;
+			left_ali = true;
+		}
+		else
+		{
+			overlap_len = len2;
+			left_ali = false; // discussable
+		}
 	}
 
 	ali = (Obi_ali_p) malloc(sizeof(Obi_ali_t));
@@ -433,7 +470,7 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 		ali->direction[0] = '\0';
 	else
 	{
-		if (((best_shift <= 0) && (!switched_seqs)) || ((best_shift > 0) && switched_seqs))
+		if (left_ali)
 			strcpy(ali->direction, "left");
 		else
 			strcpy(ali->direction, "right");
@@ -441,6 +478,8 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 
 	// Build the consensus sequence if asked
 	if (build_consensus)
+	{
+		if (! rev_quals)
 		{
 			// Get the quality arrays
 			qual1 = obi_get_qual_int_with_elt_idx_and_col_p_in_view(view1, qual_col1, idx1, 0, &qual1_len);
@@ -455,15 +494,13 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 				obidebug(1, "\nError getting the quality of the 2nd sequence when computing the kmer similarity between two sequences");
 				return NULL;
 			}
+		}
 
 		// Decode the first sequence if not already done
 		if (seq1 == NULL)
 			seq1 = obi_blob_to_seq(blob1);
 
-		if (! switched_seqs)
 		consensus_len = len2 - best_shift;
-		else
-		    consensus_len = len1 + best_shift;
 
 		// Allocate memory for consensus sequence
 		consensus_seq = (char*) malloc(consensus_len + 1 * sizeof(char)); // TODO keep malloced too maybe
@@ -557,6 +594,12 @@ Obi_ali_p kmer_similarity(Obiview_p view1, OBIDMS_column_p column1, index_t idx1
 	free(seq2);
 	free(blob2);
 
+	if (rev_quals)
+	{
+		free(qual1);
+		free(qual2);
+	}
+
 	return ali;
 }
 

src/obi_clean.c

@@ -88,42 +88,42 @@ static int create_output_columns(Obiview_p o_view,
 								 int sample_count)
 {
 	// Status column
-	if (obi_view_add_column(o_view, CLEAN_STATUS_COLUMN_NAME, -1, NULL, OBI_CHAR, 0, sample_count, (sample_column->header)->elements_names, true, false, false, NULL, NULL, -1, CLEAN_STATUS_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, CLEAN_STATUS_COLUMN_NAME, -1, NULL, OBI_CHAR, 0, sample_count, (sample_column->header)->elements_names, true, true, false, false, NULL, NULL, -1, CLEAN_STATUS_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", CLEAN_STATUS_COLUMN_NAME);
 		return -1;
 	}
 
 	// Head column
-	if (obi_view_add_column(o_view, CLEAN_HEAD_COLUMN_NAME, -1, NULL, OBI_BOOL, 0, 1, NULL, false, false, false, NULL, NULL, -1, CLEAN_HEAD_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, CLEAN_HEAD_COLUMN_NAME, -1, NULL, OBI_BOOL, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, CLEAN_HEAD_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", CLEAN_HEAD_COLUMN_NAME);
 		return -1;
 	}
 
 	// Sample count column
-	if (obi_view_add_column(o_view, CLEAN_SAMPLECOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, CLEAN_SAMPLECOUNT_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, CLEAN_SAMPLECOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, CLEAN_SAMPLECOUNT_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", CLEAN_SAMPLECOUNT_COLUMN_NAME);
 		return -1;
 	}
 
 	// Head count column
-	if (obi_view_add_column(o_view, CLEAN_HEADCOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, CLEAN_HEADCOUNT_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, CLEAN_HEADCOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, CLEAN_HEADCOUNT_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", CLEAN_HEADCOUNT_COLUMN_NAME);
 		return -1;
 	}
 
 	// Internal count column
-	if (obi_view_add_column(o_view, CLEAN_INTERNALCOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, CLEAN_INTERNALCOUNT_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, CLEAN_INTERNALCOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, CLEAN_INTERNALCOUNT_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", CLEAN_INTERNALCOUNT_COLUMN_NAME);
 		return -1;
 	}
 
 	// Singleton count column
-	if (obi_view_add_column(o_view, CLEAN_SINGLETONCOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, CLEAN_SINGLETONCOUNT_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, CLEAN_SINGLETONCOUNT_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, CLEAN_SINGLETONCOUNT_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", CLEAN_SINGLETONCOUNT_COLUMN_NAME);
 		return -1;
@@ -229,6 +229,8 @@ int obi_clean(const char* dms_name,
 		return -1;
 	}
 
+	seq_count = (i_view->infos)->line_count;
+
 	// Open the sequence column
 	if (strcmp((i_view->infos)->view_type, VIEW_TYPE_NUC_SEQS) == 0)
 		iseq_column = obi_view_get_column(i_view, NUC_SEQUENCE_COLUMN);
@@ -245,7 +247,7 @@ int obi_clean(const char* dms_name,
 	}
 
 	// Open the sample column if there is one
-	if ((strcmp(sample_column_name, "") == 0) || (sample_column_name == NULL))
+	if ((strcmp(sample_column_name, "") == 0) || (sample_column_name == NULL) || (seq_count == 0))
 	{
 		fprintf(stderr, "Info: No sample information provided, assuming one sample.\n");
 		sample_column = obi_view_get_column(i_view, COUNT_COLUMN);
@@ -340,6 +342,8 @@ int obi_clean(const char* dms_name,
 		return -1;
 	}
 
+	if (seq_count > 0)
+	{
 		// Build kmer tables
 		ktable = hash_seq_column(i_view, iseq_column, 0);
 		if (ktable == NULL)
@@ -349,8 +353,6 @@ int obi_clean(const char* dms_name,
 			return -1;
 		}
 
-	seq_count = (i_view->infos)->line_count;
-
 		// Allocate arrays for sample counts otherwise reading in mapped files takes longer
 		complete_sample_count_array = (int*) malloc(seq_count * sample_count * sizeof(int));
 		if (complete_sample_count_array == NULL)
@@ -404,6 +406,7 @@ int obi_clean(const char* dms_name,
 				}
 			}
 		}
+	}
 
 	for (i=0; i< (seq_count-1); i++)
 	{
@@ -551,17 +554,20 @@ int obi_clean(const char* dms_name,
 		}
 	}
 
+	if (seq_count > 0)
+	{
 		free_kmer_tables(ktable, seq_count);
 		free(complete_sample_count_array);
 		free(blob_array);
 		free(alignment_result_array);
+	}
 
 	fprintf(stderr, "\n");
 
 	if (stop)
 		return -1;
 
-	if (heads_only)
+	if (heads_only && (seq_count > 0))
 	{
 		line_selection = malloc((((o_view->infos)->line_count) + 1) * sizeof(index_t));
 		if (line_selection == NULL)
@@ -635,7 +641,7 @@ int obi_clean(const char* dms_name,
 	}
 
 	// Flag the end of the line selection
-	if (heads_only)
+	if (heads_only && (seq_count > 0))
 		line_selection[l] = -1;
 
 	// Create new view with line selection if heads only

src/obi_ecopcr.c

@@ -150,49 +150,49 @@ static int print_seq(Obiview_p i_view, Obiview_p o_view,
 static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 {
 	// Original length column
-	if (obi_view_add_column(o_view, ECOPCR_SEQLEN_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_SEQLEN_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_SEQLEN_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_SEQLEN_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_SEQLEN_COLUMN_NAME);
 		return -1;
 	}
 
 	// Amplicon length column
-	if (obi_view_add_column(o_view, ECOPCR_AMPLICONLEN_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_AMPLICONLEN_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_AMPLICONLEN_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_AMPLICONLEN_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_AMPLICONLEN_COLUMN_NAME);
 		return -1;
 	}
 
 	// Taxid column
-	if (obi_view_add_column(o_view, TAXID_COLUMN, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, TAXID_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, TAXID_COLUMN, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, TAXID_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", TAXID_COLUMN);
 		return -1;
 	}
 
 	// Taxonomic rank column
-	if (obi_view_add_column(o_view, ECOPCR_RANK_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_RANK_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_RANK_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_RANK_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_RANK_COLUMN_NAME);
 		return -1;
 	}
 
 	// Species taxid column
-	if (obi_view_add_column(o_view, ECOPCR_SPECIES_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_SPECIES_TAXID_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_SPECIES_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_SPECIES_TAXID_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_SPECIES_TAXID_COLUMN_NAME);
 		return -1;
 	}
 
 	// Genus taxid column
-	if (obi_view_add_column(o_view, ECOPCR_GENUS_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_GENUS_TAXID_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_GENUS_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_GENUS_TAXID_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_GENUS_TAXID_COLUMN_NAME);
 		return -1;
 	}
 
 	// Family taxid column
-	if (obi_view_add_column(o_view, ECOPCR_FAMILY_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_FAMILY_TAXID_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_FAMILY_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_FAMILY_TAXID_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_FAMILY_TAXID_COLUMN_NAME);
 		return -1;
@@ -201,7 +201,7 @@ static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 	if (kingdom_mode)
 	{
 		// Kingdom taxid column
-		if (obi_view_add_column(o_view, ECOPCR_KINGDOM_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_KINGDOM_TAXID_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(o_view, ECOPCR_KINGDOM_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_KINGDOM_TAXID_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the %s column", ECOPCR_KINGDOM_TAXID_COLUMN_NAME);
 			return -1;
@@ -210,7 +210,7 @@ static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 	else
 	{
 		// Superkingdom taxid column
-		if (obi_view_add_column(o_view, ECOPCR_SUPERKINGDOM_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_SUPERKINGDOM_TAXID_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(o_view, ECOPCR_SUPERKINGDOM_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_SUPERKINGDOM_TAXID_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the %s column", ECOPCR_SUPERKINGDOM_TAXID_COLUMN_NAME);
 			return -1;
@@ -218,28 +218,28 @@ static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 	}
 
 	// Scientific name column
-	if (obi_view_add_column(o_view, ECOPCR_SCIENTIFIC_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_SCIENTIFIC_NAME_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_SCIENTIFIC_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_SCIENTIFIC_NAME_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_SCIENTIFIC_NAME_COLUMN_NAME);
 		return -1;
 	}
 
 	// Species name column
-	if (obi_view_add_column(o_view, ECOPCR_SPECIES_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_SPECIES_NAME_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_SPECIES_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_SPECIES_NAME_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_SPECIES_NAME_COLUMN_NAME);
 		return -1;
 	}
 
 	// Genus name column
-	if (obi_view_add_column(o_view, ECOPCR_GENUS_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_GENUS_NAME_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_GENUS_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_GENUS_NAME_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_GENUS_NAME_COLUMN_NAME);
 		return -1;
 	}
 
 	// Family name column
-	if (obi_view_add_column(o_view, ECOPCR_FAMILY_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_FAMILY_NAME_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_FAMILY_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_FAMILY_NAME_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_FAMILY_NAME_COLUMN_NAME);
 		return -1;
@@ -248,7 +248,7 @@ static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 	if (kingdom_mode)
 	{
 		// Kingdom name column
-		if (obi_view_add_column(o_view, ECOPCR_KINGDOM_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_KINGDOM_NAME_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(o_view, ECOPCR_KINGDOM_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_KINGDOM_NAME_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the %s column", ECOPCR_KINGDOM_NAME_COLUMN_NAME);
 			return -1;
@@ -257,7 +257,7 @@ static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 	else
 	{
 		// Superkingdom name column
-		if (obi_view_add_column(o_view, ECOPCR_SUPERKINGDOM_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_SUPERKINGDOM_NAME_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(o_view, ECOPCR_SUPERKINGDOM_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_SUPERKINGDOM_NAME_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the %s column", ECOPCR_SUPERKINGDOM_NAME_COLUMN_NAME);
 			return -1;
@@ -265,49 +265,49 @@ static int create_output_columns(Obiview_p o_view, bool kingdom_mode)
 	}
 
 	// Strand column
-	if (obi_view_add_column(o_view, ECOPCR_STRAND_COLUMN_NAME, -1, NULL, OBI_CHAR, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_STRAND_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_STRAND_COLUMN_NAME, -1, NULL, OBI_CHAR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_STRAND_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_STRAND_COLUMN_NAME);
 		return -1;
 	}
 
 	// Primer 1 column
-	if (obi_view_add_column(o_view, ECOPCR_PRIMER1_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_PRIMER1_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_PRIMER1_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_PRIMER1_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_PRIMER1_COLUMN_NAME);
 		return -1;
 	}
 
 	// Primer 2 column
-	if (obi_view_add_column(o_view, ECOPCR_PRIMER2_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_PRIMER2_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_PRIMER2_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_PRIMER2_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_PRIMER2_COLUMN_NAME);
 		return -1;
 	}
 
 	// Error 1 column
-	if (obi_view_add_column(o_view, ECOPCR_ERROR1_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_ERROR1_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_ERROR1_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_ERROR1_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_ERROR1_COLUMN_NAME);
 		return -1;
 	}
 
 	// Error 2 column
-	if (obi_view_add_column(o_view, ECOPCR_ERROR2_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_ERROR2_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_ERROR2_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_ERROR2_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_ERROR2_COLUMN_NAME);
 		return -1;
 	}
 
 	// Temperature 1 column
-	if (obi_view_add_column(o_view, ECOPCR_TEMP1_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_TEMP1_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_TEMP1_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_TEMP1_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_TEMP1_COLUMN_NAME);
 		return -1;
 	}
 
 	// Temperature 2 column
-	if (obi_view_add_column(o_view, ECOPCR_TEMP2_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ECOPCR_TEMP2_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(o_view, ECOPCR_TEMP2_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ECOPCR_TEMP2_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the %s column", ECOPCR_TEMP2_COLUMN_NAME);
 		return -1;

src/obi_ecotag.c

@@ -104,42 +104,42 @@ int print_assignment_result(Obiview_p output_view, index_t line,
 static int create_output_columns(Obiview_p o_view)
 {
 	// Score column
-	if (obi_view_add_column(o_view, ECOTAG_SCORE_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(o_view, ECOTAG_SCORE_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the score in ecotag");
 		return -1;
 	}
 
 	// Assigned taxid column
-	if (obi_view_add_column(o_view, ECOTAG_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(o_view, ECOTAG_TAXID_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the assigned taxid in ecotag");
 		return -1;
 	}
 
 	// Assigned scientific name column
-	if (obi_view_add_column(o_view, ECOTAG_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(o_view, ECOTAG_NAME_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the assigned scientific name in ecotag");
 		return -1;
 	}
 
 	// Assignement status column
-	if (obi_view_add_column(o_view, ECOTAG_STATUS_COLUMN_NAME, -1, NULL, OBI_BOOL, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(o_view, ECOTAG_STATUS_COLUMN_NAME, -1, NULL, OBI_BOOL, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the assignment status in ecotag");
 		return -1;
 	}
 
 	// Column for array of best match ids
-	if (obi_view_add_column(o_view, ECOTAG_BEST_MATCH_IDS_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, true, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(o_view, ECOTAG_BEST_MATCH_IDS_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, true, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the array of ids of best matches in ecotag");
 		return -1;
 	}
 
 	// Column for array of best match taxids
-	if (obi_view_add_column(o_view, ECOTAG_BEST_MATCH_TAXIDS_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, true, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(o_view, ECOTAG_BEST_MATCH_TAXIDS_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, true, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the array of taxids of best matches in ecotag");
 		return -1;
@@ -233,7 +233,7 @@ int obi_ecotag(const char* dms_name,
 		// Write result (max score, threshold, LCA assigned, list of the ids of the best matches)
 
 
-	index_t         i, j, k;
+	index_t         i, j, k, t;
 	ecotx_t*        lca;
 	ecotx_t*        lca_in_array;
 	ecotx_t*        best_match;
@@ -259,16 +259,20 @@ int obi_ecotag(const char* dms_name,
 	int32_t*   		best_match_taxids;
 	int32_t*		best_match_taxids_to_store;
 	int				best_match_count;
+	int				best_match_taxid_count;
 	int             buffer_size;
 	int 			best_match_ids_buffer_size;
 	index_t         best_match_idx;
 	int32_t         lca_array_length;
 	int32_t         lca_taxid;
 	int32_t         taxid_best_match;
+	int32_t         taxid;
+	int32_t         taxid_to_store;
 	bool   			assigned;
 	const char*		lca_name;
 	const char*		id;
 	int				id_len;
+	bool			already_in;
 
 	OBIDMS_p          dms = NULL;
 	OBIDMS_p		  ref_dms = NULL;
@@ -488,10 +492,11 @@ int obi_ecotag(const char* dms_name,
 
 	for (i=0; i < query_count; i++)
 	{
-		if (i%1000 == 0)
+		if (i%10 == 0)
 			fprintf(stderr,"\rDone : %f %%       ", (i / (float) query_count)*100);
 
 		best_match_count = 0;
+		best_match_taxid_count = 0;
 		best_match_ids_length = 0;
 		threshold = ecotag_threshold;
 		best_score = 0.0;
@@ -543,6 +548,7 @@ int obi_ecotag(const char* dms_name,
 					// Reset the array with that match
 					best_match_ids_length = 0;
 					best_match_count = 0;
+					best_match_taxid_count = 0;
 				}
 
 				// Store in best match array
@@ -585,8 +591,27 @@ int obi_ecotag(const char* dms_name,
 
 				// Save match
 				best_match_array[best_match_count] = j;
-				best_match_taxids[best_match_count] = obi_get_int_with_elt_idx_and_col_p_in_view(ref_view, ref_taxid_column, j, 0);
 				best_match_count++;
+
+				// Save best match taxid only if not already in array
+				taxid_to_store = obi_get_int_with_elt_idx_and_col_p_in_view(ref_view, ref_taxid_column, j, 0);
+				already_in = false;
+				for (t=0; t<best_match_taxid_count; t++)
+				{
+					taxid = best_match_taxids[t];
+					//fprintf(stderr, "\ntaxid %d, taxid_to_store %d\n", taxid, taxid_to_store);
+					if (taxid == taxid_to_store)
+					{
+						already_in = true;
+						break;
+					}
+				}
+				if (! already_in)
+				{
+					best_match_taxids[best_match_taxid_count] = taxid_to_store;
+					best_match_taxid_count++;
+				}
+
 				strcpy(best_match_ids+best_match_ids_length, id);
 				best_match_ids_length = best_match_ids_length + id_len + 1;
 			}
@@ -693,7 +718,7 @@ int obi_ecotag(const char* dms_name,
 									assigned_name_column, lca_name,
 									assigned_status_column, assigned,
 									best_match_ids_column, best_match_ids_to_store, best_match_ids_length,
-									best_match_taxids_column, best_match_taxids_to_store, best_match_count,
+									best_match_taxids_column, best_match_taxids_to_store, best_match_taxid_count,
 									score_column, best_score
 									) < 0)
 							return -1;

src/obi_lcs.c

@@ -155,35 +155,35 @@ static int create_alignment_output_columns(Obiview_p output_view,
 										   bool normalize, int reference, bool similarity_mode)
 {
 	// Create the column for the ids of the 1st sequence aligned
-	if (obi_view_add_column(output_view, ID1_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, id1_indexer_name, NULL, -1, ID1_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(output_view, ID1_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, id1_indexer_name, NULL, -1, ID1_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the first column for the sequence ids when aligning");
 		return -1;
 	}
 
 	// Create the column for the ids of the 2nd sequence aligned
-	if (obi_view_add_column(output_view, ID2_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, id2_indexer_name, NULL, -1, ID2_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(output_view, ID2_COLUMN_NAME, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, id2_indexer_name, NULL, -1, ID2_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the second column for the sequence ids when aligning");
 		return -1;
 	}
 
 	// Create the column for the index (in the input view) of the first sequences aligned
-	if (obi_view_add_column(output_view, IDX1_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, IDX1_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(output_view, IDX1_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, IDX1_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the first column for the sequence indices when aligning");
 		return -1;
 	}
 
 	// Create the column for the index (in the input view) of the second sequences aligned
-	if (obi_view_add_column(output_view, IDX2_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, IDX2_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(output_view, IDX2_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, IDX2_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the second column for the sequence indices when aligning");
 		return -1;
 	}
 
 	// Create the column for the LCS length
-	if (obi_view_add_column(output_view, LCS_LENGTH_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, LCS_LENGTH_COLUMN_COMMENTS, true) < 0)
+	if (obi_view_add_column(output_view, LCS_LENGTH_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, LCS_LENGTH_COLUMN_COMMENTS, true) < 0)
 	{
 		obidebug(1, "\nError creating the column for the LCS length when aligning");
 		return -1;
@@ -192,7 +192,7 @@ static int create_alignment_output_columns(Obiview_p output_view,
 	// Create the column for the alignment length if it is computed
 	if ((reference == ALILEN) && (normalize || !similarity_mode))
 	{
-		if (obi_view_add_column(output_view, ALI_LENGTH_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, ALI_LENGTH_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(output_view, ALI_LENGTH_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, ALI_LENGTH_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the column for the alignment length when aligning");
 			return -1;
@@ -201,7 +201,7 @@ static int create_alignment_output_columns(Obiview_p output_view,
 	// Create the column for the alignment score
 	if (normalize)
 	{
-		if (obi_view_add_column(output_view, SCORE_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, NULL, NULL, -1, SCORE_COLUMN_NAME, true) < 0)
+		if (obi_view_add_column(output_view, SCORE_COLUMN_NAME, -1, NULL, OBI_FLOAT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, SCORE_COLUMN_NAME, true) < 0)
 		{
 			obidebug(1, "\nError creating the column for the score when aligning");
 			return -1;
@@ -209,7 +209,7 @@ static int create_alignment_output_columns(Obiview_p output_view,
 	}
 	else
 	{
-		if (obi_view_add_column(output_view, SCORE_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, SCORE_COLUMN_NAME, true) < 0)
+		if (obi_view_add_column(output_view, SCORE_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, SCORE_COLUMN_NAME, true) < 0)
 		{
 			obidebug(1, "\nError creating the column for the score when aligning");
 			return -1;
@@ -219,14 +219,14 @@ static int create_alignment_output_columns(Obiview_p output_view,
 	if (print_seq)
 	{
 		// Create the column for the first sequences aligned
-		if (obi_view_add_column(output_view, SEQ1_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, seq1_indexer_name, NULL, -1, SEQ1_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(output_view, SEQ1_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, false, seq1_indexer_name, NULL, -1, SEQ1_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the first column for the sequences when aligning");
 			return -1;
 		}
 
 		// Create the column for the second sequences aligned
-		if (obi_view_add_column(output_view, SEQ2_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, seq2_indexer_name, NULL, -1, SEQ2_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(output_view, SEQ2_COLUMN_NAME, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, false, seq2_indexer_name, NULL, -1, SEQ2_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the second column for the sequences when aligning");
 			return -1;
@@ -235,14 +235,14 @@ static int create_alignment_output_columns(Obiview_p output_view,
 	if (print_count)
 	{
 		// Create the column for the count of the first sequences aligned
-		if (obi_view_add_column(output_view, COUNT1_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, COUNT1_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(output_view, COUNT1_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, COUNT1_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the first column for the sequence counts when aligning");
 			return -1;
 		}
 
 		// Create the column for the count of the second sequences aligned
-		if (obi_view_add_column(output_view, COUNT2_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, COUNT2_COLUMN_COMMENTS, true) < 0)
+		if (obi_view_add_column(output_view, COUNT2_COLUMN_NAME, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, COUNT2_COLUMN_COMMENTS, true) < 0)
 		{
 			obidebug(1, "\nError creating the second column for the sequence counts when aligning");
 			return -1;

src/obiavl.c

@@ -582,6 +582,7 @@ int truncate_avl_to_size_used(OBIDMS_avl_p avl)	// TODO is it necessary to unmap
 {
 	size_t  			file_size;
 	size_t  			new_data_size;
+	size_t  			header_size;
 	double  			multiple;
 	int 				file_descriptor;
 
@@ -589,6 +590,8 @@ int truncate_avl_to_size_used(OBIDMS_avl_p avl)	// TODO is it necessary to unmap
 	multiple = ceil((double) (ONE_IF_ZERO((avl->header)->nb_items * sizeof(AVL_node_t))) / (double) getpagesize());
 	new_data_size = ((size_t) multiple) * getpagesize();
 
+	header_size = (avl->header)->header_size;
+
 	// Check that it is actually greater than the current size of the file, otherwise no need to truncate
 	if ((avl->header)->avl_size == new_data_size)
 		return 0;
@@ -596,16 +599,22 @@ int truncate_avl_to_size_used(OBIDMS_avl_p avl)	// TODO is it necessary to unmap
 	// Get the file descriptor
 	file_descriptor = avl->avl_fd;
 
-	// Unmap the tree before truncating the file
+	// Unmap the entire file before truncating it (WSL requirement)
 	if (munmap(avl->tree, (avl->header)->avl_size) < 0)
 	{
 		obi_set_errno(OBI_AVL_ERROR);
 		obidebug(1, "\nError munmapping the tree of an AVL before truncating");
 		return -1;
 	}
+	if (munmap(avl->header, header_size) < 0)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError munmapping the tree of an AVL before truncating");
+		return -1;
+	}
 
 	// Truncate the file
-	file_size = (avl->header)->header_size + new_data_size;
+	file_size = header_size + new_data_size;
 	if (ftruncate(file_descriptor, file_size) < 0)
 	{
 		obi_set_errno(OBI_AVL_ERROR);
@@ -613,7 +622,22 @@ int truncate_avl_to_size_used(OBIDMS_avl_p avl)	// TODO is it necessary to unmap
 		return -1;
 	}
 
-	// Remap the data
+	// Remap the header and the data
+
+	avl->header    = mmap(NULL,
+			         header_size,
+					 PROT_READ | PROT_WRITE,
+					 MAP_SHARED,
+					 file_descriptor,
+					 0
+					);
+	if (avl->header == MAP_FAILED)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError re-mmapping the header of an AVL after truncating");
+		return -1;
+	}
+
 	avl->tree = mmap(NULL,
 			         new_data_size,
 					 PROT_READ | PROT_WRITE,
@@ -640,6 +664,7 @@ int truncate_avl_data_to_size_used(OBIDMS_avl_data_p avl_data)	// TODO is it nec
 {
 	size_t  			file_size;
 	index_t  			new_data_size;
+	size_t  			header_size;
 	double  			multiple;
 	int 				file_descriptor;
 
@@ -647,6 +672,8 @@ int truncate_avl_data_to_size_used(OBIDMS_avl_data_p avl_data)	// TODO is it nec
 	multiple = ceil((double) (ONE_IF_ZERO((avl_data->header)->data_size_used)) / (double) getpagesize());
 	new_data_size = ((index_t) multiple) * getpagesize();
 
+	header_size = (avl_data->header)->header_size;
+
 	// Check that it is actually greater than the current size of the file, otherwise no need to truncate
 	if ((avl_data->header)->data_size_max >= new_data_size)
 		return 0;
@@ -654,7 +681,8 @@ int truncate_avl_data_to_size_used(OBIDMS_avl_data_p avl_data)	// TODO is it nec
 	// Get the file descriptor
 	file_descriptor = avl_data->data_fd;
 
-	// Unmap the data before truncating the file
+	// Unmap the entire file before truncating it (WSL requirement)
+
 	if (munmap(avl_data->data, (avl_data->header)->data_size_max) < 0)
 	{
 		obi_set_errno(OBI_AVL_ERROR);
@@ -662,8 +690,15 @@ int truncate_avl_data_to_size_used(OBIDMS_avl_data_p avl_data)	// TODO is it nec
 		return -1;
 	}
 
+	if (munmap(avl_data->header, header_size) < 0)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError munmapping the header of an AVL before truncating");
+		return -1;
+	}
+
 	// Truncate the file
-	file_size = (avl_data->header)->header_size + new_data_size;
+	file_size = header_size + new_data_size;
 	if (ftruncate(file_descriptor, file_size) < 0)
 	{
 		obi_set_errno(OBI_AVL_ERROR);
@@ -672,6 +707,22 @@ int truncate_avl_data_to_size_used(OBIDMS_avl_data_p avl_data)	// TODO is it nec
 	}
 
 	// Remap the data
+
+	avl_data->header = mmap(NULL,
+					        header_size,
+						    PROT_READ | PROT_WRITE,
+						    MAP_SHARED,
+						    file_descriptor,
+						    0
+					      );
+
+	if (avl_data->header == MAP_FAILED)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError re-mmapping the header of an AVL after truncating");
+		return -1;
+	}
+
 	avl_data->data = mmap(NULL,
 					      new_data_size,
 						  PROT_READ | PROT_WRITE,
@@ -710,6 +761,20 @@ int grow_avl(OBIDMS_avl_p avl)		// TODO Lock when needed
 	header_size = (avl->header)->header_size;
 	file_size = header_size + new_data_size;
 
+	// Unmap the entire file before truncating it (WSL requirement)
+	if (munmap(avl->tree, old_data_size) < 0)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError munmapping the tree of an AVL tree file before enlarging");
+		return -1;
+	}
+	if (munmap(avl->header, header_size) < 0)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError munmapping the header of an AVL tree file before enlarging");
+		return -1;
+	}
+
 	// Enlarge the file
 	if (ftruncate(avl_file_descriptor, file_size) < 0)
 	{
@@ -718,12 +783,20 @@ int grow_avl(OBIDMS_avl_p avl)		// TODO Lock when needed
 		return -1;
 	}
 
-	// Unmap and re-map the data
+	// Re-map
 
-	if (munmap(avl->tree, old_data_size) < 0)
+	avl->header = mmap(NULL,
+					   header_size,
+					   PROT_READ | PROT_WRITE,
+					   MAP_SHARED,
+					   avl_file_descriptor,
+					   0
+					  );
+
+	if (avl->header == MAP_FAILED)
 	{
 		obi_set_errno(OBI_AVL_ERROR);
-		obidebug(1, "\nError munmapping the tree of an AVL tree file before enlarging");
+		obidebug(1, "\nError re-mmapping the header of an AVL tree file after enlarging the file");
 		return -1;
 	}
 
@@ -768,6 +841,20 @@ int grow_avl_data(OBIDMS_avl_data_p avl_data)		// TODO Lock when needed
 	header_size = (avl_data->header)->header_size;
 	file_size = header_size + new_data_size;
 
+	// Unmap the entire file before truncating it (WSL requirement)
+	if (munmap(avl_data->data, old_data_size) < 0)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError munmapping the data of an AVL tree data file before enlarging");
+		return -1;
+	}
+	if (munmap(avl_data->header, header_size) < 0)
+	{
+		obi_set_errno(OBI_AVL_ERROR);
+		obidebug(1, "\nError munmapping the header of an AVL tree data file before enlarging");
+		return -1;
+	}
+
 	// Enlarge the file
 	if (ftruncate(avl_data_file_descriptor, file_size) < 0)
 	{
@@ -776,12 +863,19 @@ int grow_avl_data(OBIDMS_avl_data_p avl_data)		// TODO Lock when needed
 		return -1;
 	}
 
-	// Unmap and re-map the data
+	// Re-map
 
-	if (munmap(avl_data->data, old_data_size) < 0)
+	avl_data->header = mmap(NULL,
+						    header_size,
+						    PROT_READ | PROT_WRITE,
+						    MAP_SHARED,
+						    avl_data_file_descriptor,
+						    0
+						   );
+	if (avl_data->header == MAP_FAILED)
 	{
 		obi_set_errno(OBI_AVL_ERROR);
-		obidebug(1, "\nError munmapping the data of an AVL tree data file before enlarging");
+		obidebug(1, "\nError re-mmapping the header of an AVL tree data file after enlarging the file");
 		return -1;
 	}
 
@@ -792,7 +886,6 @@ int grow_avl_data(OBIDMS_avl_data_p avl_data)		// TODO Lock when needed
 						  avl_data_file_descriptor,
 						  header_size
 						 );
-
 	if (avl_data->data == MAP_FAILED)
 	{
 		obi_set_errno(OBI_AVL_ERROR);

src/obidms.c

@@ -316,6 +316,15 @@ static int enlarge_infos_file(OBIDMS_p dms, size_t new_size)
 	multiple = 	ceil((double) new_size / (double) getpagesize());
 	rounded_new_size = multiple * getpagesize();
 
+	// Unmap the entire file before truncating it (WSL requirement)
+	if (munmap(dms->infos, (dms->infos)->file_size) < 0)
+	{
+		obi_set_errno(OBIDMS_UNKNOWN_ERROR);
+		obidebug(1, "\nError munmapping a DMS information file when enlarging");
+		close(infos_file_descriptor);
+		return -1;
+	}
+
 	// Enlarge the file
 	if (ftruncate(infos_file_descriptor, rounded_new_size) < 0)
 	{
@@ -325,15 +334,7 @@ static int enlarge_infos_file(OBIDMS_p dms, size_t new_size)
 		return -1;
 	}
 
-	// Unmap and remap the file
-	if (munmap(dms->infos, (dms->infos)->file_size) < 0)
-	{
-		obi_set_errno(OBIDMS_UNKNOWN_ERROR);
-		obidebug(1, "\nError munmapping a DMS information file when enlarging");
-		close(infos_file_descriptor);
-		return -1;
-	}
-
+	// Remap the file
 	dms->infos = mmap(NULL,
 					  rounded_new_size,
 					  PROT_READ | PROT_WRITE,
@@ -1575,8 +1576,8 @@ obiversion_t obi_import_column(const char* dms_path_1, const char* dms_path_2, c
 
 	// Create new column
 	column_2 = obi_create_column(dms_2, column_name, header_1->returned_data_type, header_1->line_count,
-								 header_1->nb_elements_per_line, header_1->elements_names, true, header_1->tuples,
-								 header_1->to_eval, new_avl_name, (header_1->associated_column).column_name,
+								 header_1->nb_elements_per_line, header_1->elements_names, true, header_1->dict_column,
+								 header_1->tuples, header_1->to_eval, new_avl_name, (header_1->associated_column).column_name,
 								 (header_1->associated_column).version, header_1->comments);
 
 	if (column_2 == NULL)
@@ -1813,6 +1814,7 @@ int obi_import_view(const char* dms_path_1, const char* dms_path_2, const char*
 								false,
 								false,
 								false,
+								false,
 								NULL,
 								NULL,
 								-1,

src/obidms.h

@@ -40,7 +40,7 @@
                                 	 	 	 	 */
 #define MAX_NB_OPENED_INDEXERS (1000) 			/**< The maximum number of indexers open at the same time.
                                 	 	 	 	 */
-#define MAX_PATH_LEN (1024)						/**< Maximum length for the character string defining a
+#define MAX_PATH_LEN (2048)						/**< Maximum length for the character string defining a
  	 	 	 	 	 	 	 	 	 	 	 	 *	 file or directory path.
  	 	 	 	 	 	 	 	 	 	 	 	 */
 

src/obidms_taxonomy.c

@@ -2463,6 +2463,32 @@ int read_merged_dmp(const char* taxdump, OBIDMS_taxonomy_p tax, int32_t* delnode
 				return -1;
 			}
 
+			// Write the rest of the taxa from the current taxa list
+			while (nT < (tax->taxa)->count)
+			{
+			// Add element from taxa list
+				// Enlarge structure if needed
+				if (n == buffer_size)
+				{
+					buffer_size = buffer_size * 2;
+					tax->merged_idx = (ecomergedidx_t*) realloc(tax->merged_idx, sizeof(ecomergedidx_t) + sizeof(ecomerged_t) * buffer_size);
+					if (tax->merged_idx == NULL)
+					{
+						obi_set_errno(OBI_MALLOC_ERROR);
+						obidebug(1, "\nError reallocating memory for a taxonomy structure");
+						closedir(tax_dir);
+						fclose(file);
+						return -1;
+					}
+				}
+
+				(tax->merged_idx)->merged[n].taxid = (tax->taxa)->taxon[nT].taxid;
+				(tax->merged_idx)->merged[n].idx = nT;
+
+				nT++;
+				n++;
+			}
+
 			// Store count
 			(tax->merged_idx)->count = n;
 

src/obidms_taxonomy.h

@@ -75,7 +75,7 @@ typedef struct {
  	 	 	 	 	 	 	 */
 	int32_t max_taxid;		/**< Maximum taxid existing in the taxon index.
 	 	 	 	 	 	 	 */
-	int32_t buffer_size;	/**< Number of taxa.	// TODO kept this but not sure of its use
+	int32_t buffer_size;	/**< .	// TODO kept this but not sure of its use
  	 	 	 	 	 	 	 */
 	ecotx_t taxon[];		/**< Taxon array.
  	 	 	 	 	 	 	 */

src/obidmscolumn.c

@@ -1024,6 +1024,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p     dms,
 								  index_t      nb_elements_per_line,
 								  char*        elements_names,
 								  bool		   elt_names_formatted,
+								  bool         dict_column,
 								  bool		   tuples,
 								  bool         to_eval,
 								  const char*  indexer_name,
@@ -1282,6 +1283,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p     dms,
 	header->nb_elements_per_line          = nb_elements_per_line;
 	header->stored_data_type     		  = stored_data_type;
 	header->returned_data_type   		  = returned_data_type;
+	header->dict_column     			  = dict_column;
 	header->tuples     					  = tuples;
 	header->to_eval                       = to_eval;
 	header->creation_date 		 		  = time(NULL);
@@ -1611,6 +1613,7 @@ OBIDMS_column_p obi_clone_column(OBIDMS_p         dms,
 								   nb_elements_per_line,
 								   (column_to_clone->header)->elements_names,
 								   true,
+								   (column_to_clone->header)->dict_column,
 								   (column_to_clone->header)->tuples,
 								   (column_to_clone->header)->to_eval,
 								   (column_to_clone->header)->indexer_name,
@@ -1766,6 +1769,7 @@ int obi_truncate_column(OBIDMS_column_p column)	// TODO is it necessary to unmap
 {
 	size_t  file_size;
 	size_t  data_size;
+	size_t  header_size;
 	index_t new_line_count;
 	double  multiple;
 	int 	column_file_descriptor;
@@ -1788,6 +1792,8 @@ int obi_truncate_column(OBIDMS_column_p column)	// TODO is it necessary to unmap
 
 	data_size = obi_array_sizeof((column->header)->stored_data_type, new_line_count, (column->header)->nb_elements_per_line);
 
+	header_size = (column->header)->header_size;
+
 	// Check that it is actually greater than the current data size, otherwise no need to truncate
 	if ((column->header)->data_size == data_size)
 		return 0;
@@ -1852,7 +1858,7 @@ int obi_truncate_column(OBIDMS_column_p column)	// TODO is it necessary to unmap
 		return -1;
 	}
 
-	// Unmap the data before truncating the file
+	// Unmap the entire file before truncating it (WSL requirement)
 	if (munmap(column->data, (column->header)->data_size) < 0)
 	{
 		obi_set_errno(OBICOL_UNKNOWN_ERROR);
@@ -1860,9 +1866,16 @@ int obi_truncate_column(OBIDMS_column_p column)	// TODO is it necessary to unmap
 		close(column_file_descriptor);
 		return -1;
 	}
+	if (munmap(column->header, header_size) < 0)
+	{
+		obi_set_errno(OBICOL_UNKNOWN_ERROR);
+		obidebug(1, "\nError munmapping the header of a column before truncating");
+		close(column_file_descriptor);
+		return -1;
+	}
 
 	// Truncate the column file
-	file_size = (column->header)->header_size + data_size;
+	file_size = header_size + data_size;
 	if (ftruncate(column_file_descriptor, file_size) < 0)
 	{
 		obi_set_errno(OBICOL_UNKNOWN_ERROR);
@@ -1871,13 +1884,30 @@ int obi_truncate_column(OBIDMS_column_p column)	// TODO is it necessary to unmap
 		return -1;
 	}
 
-	// Remap the data
+	// Remap the header and the data
+
+	column->header = mmap(NULL,
+						  header_size,
+						  PROT_READ | PROT_WRITE,
+						  MAP_SHARED,
+						  column_file_descriptor,
+						  0
+					     );
+
+	if (column->header == MAP_FAILED)
+	{
+		obi_set_errno(OBICOL_UNKNOWN_ERROR);
+		obidebug(1, "\nError re-mmapping the header of a column after truncating");
+		close(column_file_descriptor);
+		return -1;
+	}
+
 	column->data = mmap(NULL,
 						data_size,
 						PROT_READ | PROT_WRITE,
 						MAP_SHARED,
 						column_file_descriptor,
-						(column->header)->header_size
+						header_size
 					   );
 
 	if (column->data == MAP_FAILED)

src/obidmscolumn.h

@@ -36,7 +36,7 @@
 										   	   	 */
 #define COLUMN_GROWTH_FACTOR (2)	 	  		/**< The growth factor when a column is enlarged.
                                 	   	   	   	 */
-#define MAXIMUM_LINE_COUNT (1000000000)   		/**< The maximum line count for the data of a column (1E9). //TODO
+#define MAXIMUM_LINE_COUNT (1000000000000)      /**< The maximum line count for the data of a column (1E12). //TODO
                                 	       	   	 */
 #define COMMENTS_MAX_LENGTH (4096)        		/**< The maximum length for comments.
  	 	 	 	 	 	 	 	 	       	   	 */
@@ -77,6 +77,8 @@ typedef struct OBIDMS_column_header {
 	OBIType_t			stored_data_type;		    						/**< Type of the data that is actually stored in the data
 															 	 	 	 	 *   part of the column.
 															 	 	 	 	 */
+	bool                dict_column;										/**< Whether the column contains dictionary-like values.
+	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 */
 	bool				tuples;												/**< A boolean indicating whether the column contains indices referring to indexed tuples.
 																			 */
 	bool				to_eval;											/**< A boolean indicating whether the column contains expressions that should be evaluated
@@ -249,6 +251,7 @@ size_t obi_calculate_header_size(index_t nb_elements_per_line, int64_t elts_name
  * @param elements_names The names of the elements with ';' as separator (no terminal ';'),
  *                       NULL or "" if the default names are to be used ("0\01\02\0...\0n").
  * @param elt_names_formatted Whether the separator for the elements names is ';' (false), or '\0' (true, as formatted by format_elements_names()).
+ * @param dict_column A boolean indicating whether the column should contain dictionary-like values.
  * @param tuples A boolean indicating whether the column should contain indices referring to indexed tuples.
  * @param to_eval A boolean indicating whether the column contains expressions that should be evaluated
  *                (typically OBI_STR columns containing character strings to be evaluated by Python).
@@ -271,6 +274,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p     dms,
 								  index_t      nb_elements_per_line,
 								  char*        elements_names,
 								  bool		   elt_names_formatted,
+								  bool         dict_column,
 								  bool         tuples,
 								  bool         to_eval,
 								  const char*  indexer_name,

src/obisig.h

@@ -25,7 +25,7 @@
  * @author Celine Mercier (celine.mercier@metabarcoding.org)
  *
  */
-bool volatile keep_running;
+extern bool volatile keep_running;
 void sig_handler(int signum);
 
 

src/obitypes.h

@@ -29,6 +29,8 @@
 #define OBIQual_int_NA (NULL)		/**< NA value for the type OBI_QUAL if the quality is in integer format */
 #define OBITuple_NA (NULL)			/**< NA value for tuples of any type */
 
+#define OBI_INT_MAX (INT32_MAX)     /**< Maximum value for the type OBI_INT */
+
 
 /**
  * @brief enum for the boolean OBIType.

src/obiview.c

@@ -638,6 +638,15 @@ static int enlarge_view_file(Obiview_p view, size_t new_size)
 	multiple = 	ceil((double) new_size / (double) getpagesize());
 	rounded_new_size = multiple * getpagesize();
 
+	// Unmap the entire file before truncating it (WSL requirement)
+	if (munmap(view->infos, (view->infos)->file_size) < 0)
+	{
+		obi_set_errno(OBIVIEW_ERROR);
+		obidebug(1, "\nError munmapping a view file when enlarging");
+		close(obiview_file_descriptor);
+		return -1;
+	}
+
 	// Enlarge the file
 	if (ftruncate(obiview_file_descriptor, rounded_new_size) < 0)
 	{
@@ -647,15 +656,7 @@ static int enlarge_view_file(Obiview_p view, size_t new_size)
 		return -1;
 	}
 
-	// Unmap and remap the file
-	if (munmap(view->infos, (view->infos)->file_size) < 0)
-	{
-		obi_set_errno(OBIVIEW_ERROR);
-		obidebug(1, "\nError munmapping a view file when enlarging");
-		close(obiview_file_descriptor);
-		return -1;
-	}
-
+	// Remap the file
 	view->infos = mmap(NULL,
 					   rounded_new_size,
 					   PROT_READ | PROT_WRITE,
@@ -1712,7 +1713,7 @@ Obiview_p obi_new_view(OBIDMS_p dms, const char* view_name, Obiview_p view_to_cl
 		// If there is a new line selection, build it by combining it with the one from the view to clone if there is one
 		else if (line_selection != NULL)
 		{
-			view->line_selection = obi_create_column(view->dms, LINES_COLUMN_NAME, OBI_IDX, 0, 1, NULL, false, false, false, NULL, NULL, -1, NULL);
+			view->line_selection = obi_create_column(view->dms, LINES_COLUMN_NAME, OBI_IDX, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, NULL);
 			if ((view->line_selection) == NULL)
 			{
 				obidebug(1, "\nError creating a column corresponding to a line selection");
@@ -1862,6 +1863,7 @@ Obiview_p obi_new_view(OBIDMS_p dms, const char* view_name, Obiview_p view_to_cl
 									false,
 									false,
 									false,
+									false,
 									NULL,
 									NULL,
 									-1,
@@ -1930,19 +1932,19 @@ Obiview_p obi_new_view_nuc_seqs(OBIDMS_p dms, const char* view_name, Obiview_p v
 	if ((view_to_clone == NULL) && create_default_columns)
 	{
 		// Adding sequence column
-		if (obi_view_add_column(view, NUC_SEQUENCE_COLUMN, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)	// discuss using same indexer "NUC_SEQ_INDEXER"
+		if (obi_view_add_column(view, NUC_SEQUENCE_COLUMN, -1, NULL, OBI_SEQ, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)	// discuss using same indexer "NUC_SEQ_INDEXER"
 		{
 			obidebug(1, "Error adding an obligatory column in a nucleotide sequences view");
 			return NULL;
 		}
 		// Adding id column
-		if (obi_view_add_column(view, ID_COLUMN, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+		if (obi_view_add_column(view, ID_COLUMN, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 		{
 			obidebug(1, "Error adding an obligatory column in a nucleotide sequences view");
 			return NULL;
 		}
 		// Adding definition column
-		if (obi_view_add_column(view, DEFINITION_COLUMN, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+		if (obi_view_add_column(view, DEFINITION_COLUMN, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 		{
 			obidebug(1, "Error adding an obligatory column in a nucleotide sequences view");
 			return NULL;
@@ -1951,7 +1953,7 @@ Obiview_p obi_new_view_nuc_seqs(OBIDMS_p dms, const char* view_name, Obiview_p v
 		if (quality_column)
 		{
 			associated_nuc_column = obi_view_get_column(view, NUC_SEQUENCE_COLUMN);
-			if (obi_view_add_column(view, QUALITY_COLUMN, -1, NULL, OBI_QUAL, 0, 1, NULL, false, false, false, NULL, (associated_nuc_column->header)->name, (associated_nuc_column->header)->version, "{}", true) < 0)		// TODO discuss automatic association
+			if (obi_view_add_column(view, QUALITY_COLUMN, -1, NULL, OBI_QUAL, 0, 1, NULL, false, false, false, false, NULL, (associated_nuc_column->header)->name, (associated_nuc_column->header)->version, "{}", true) < 0)		// TODO discuss automatic association
 			{
 				obidebug(1, "Error adding an obligatory column in a nucleotide sequences view");
 				return NULL;
@@ -2284,6 +2286,7 @@ int obi_view_add_column(Obiview_p    view,
 						index_t      nb_elements_per_line,
 						char*        elements_names,
 						bool         elt_names_formatted,
+						bool         dict_column,
 						bool		 tuples,
 						bool         to_eval,
 						const char*  indexer_name,
@@ -2366,7 +2369,7 @@ int obi_view_add_column(Obiview_p    view,
 	// Open or create the column
 	if (create)
 	{	// Create column
-		column = obi_create_column(view->dms, column_name, data_type, nb_lines, nb_elements_per_line, elements_names, elt_names_formatted, tuples, to_eval, indexer_name, associated_column_name, associated_column_version, comments);
+		column = obi_create_column(view->dms, column_name, data_type, nb_lines, nb_elements_per_line, elements_names, elt_names_formatted, dict_column, tuples, to_eval, indexer_name, associated_column_name, associated_column_version, comments);
 		if (column == NULL)
 		{
 			obidebug(1, "\nError creating a column to add to a view");
@@ -3230,7 +3233,7 @@ int obi_create_auto_count_column(Obiview_p view)
 		return -1;
 	}
 
-	if (obi_view_add_column(view, COUNT_COLUMN, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(view, COUNT_COLUMN, -1, NULL, OBI_INT, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "Error adding an automatic count column in a view");
 		return -1;
@@ -3282,7 +3285,7 @@ int obi_create_auto_id_column(Obiview_p view, const char* prefix)
 	}
 
 	// Create the new ID column
-	if (obi_view_add_column(view, ID_COLUMN, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, NULL, NULL, -1, "{}", true) < 0)
+	if (obi_view_add_column(view, ID_COLUMN, -1, NULL, OBI_STR, 0, 1, NULL, false, false, false, false, NULL, NULL, -1, "{}", true) < 0)
 	{
 		obidebug(1, "Error adding an automatic ID column in a view");
 		return -1;

src/obiview.h

@@ -400,6 +400,7 @@ Obiview_p obi_open_view(OBIDMS_p dms, const char* view_name);
  * @param elements_names The names of the elements with ';' as separator (no terminal ';'),
  * 						 if the column is created; NULL or "" if the default names are to be used ("0\01\02\0...\0n").
  * @param elt_names_formatted Whether the separator for the elements names is ';' (false), or '\0' (true, as formatted by format_elements_names()).
+ * @param dict_column Whether the column contains dictionary-like values.
  * @param tuples A boolean indicating whether the column should contain indices referring to indexed tuples.
  * @param to_eval A boolean indicating whether the column contains expressions that should be evaluated
  *                (typically OBI_STR columns containing character strings to be evaluated by Python).
@@ -426,6 +427,7 @@ int obi_view_add_column(Obiview_p    view,
 						index_t      nb_elements_per_line,
 						char*        elements_names,
 						bool         elt_names_formatted,
+						bool         dict_column,
 						bool         tuples,
 						bool         to_eval,
 						const char*  indexer_name,