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

Minor fixes

Browse Source
This commit is contained in:
Celine Mercier
2019-08-18 19:45:53 +02:00
parent 66441e0aef
commit 5f20be44b2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/obi_ecotag.c
View File

@ -573,7 +573,7 @@ int obi_ecotag(const char* dms_name,
best_match = obi_taxo_get_taxon_with_taxid(taxonomy, taxid_best_match); best_match = obi_taxo_get_taxon_with_taxid(taxonomy, taxid_best_match);
if (best_match == NULL) if (best_match == NULL)
{ {
obidebug(1, "\nError getting a taxon from a taxid when doing taxonomic assignment"); obidebug(1, "\nError getting a taxon from a taxid (%d) when doing taxonomic assignment", taxid_best_match);
return -1; return -1;
} }
if (j>0) if (j>0)

2
src/obidmscolumn.h
View File

@ -106,7 +106,7 @@ typedef struct OBIDMS_column_header {
* and '\0\0' as terminal flag. * and '\0\0' as terminal flag.
* (default are the indices: "0\01\02\0...\0n\0\0"). * (default are the indices: "0\01\02\0...\0n\0\0").
*/ */
int64_t* elements_names_idx; /**< Pointer in mem_arnea on the index for the start of each element name in elements_names. int64_t* elements_names_idx; /**< Pointer in mem_arena on the index for the start of each element name in elements_names.
*/ */
int64_t* sorted_elements_idx; /**< Index for the sorted element names in elements_names_idx. int64_t* sorted_elements_idx; /**< Index for the sorted element names in elements_names_idx.
*/ */

3
src/obiview.h
View File

@ -57,6 +57,9 @@
*/ */
#define TAXID_COLUMN "TAXID" /**< The name of the column containing the taxids. TODO subtype of INT column? #define TAXID_COLUMN "TAXID" /**< The name of the column containing the taxids. TODO subtype of INT column?
*/ */
#define MERGED_TAXID_COLUMN "merged_TAXID" /**< The name of the column containing the merged taxids information.
*/ // TODO maybe mix of lower and uppercase == bad
#define ID_PREFIX "seq" /**< The default prefix of sequence identifiers in automatic ID columns. #define ID_PREFIX "seq" /**< The default prefix of sequence identifiers in automatic ID columns.
*/ */
#define PREDICATE_KEY "predicates" /**< The key used in the json-formatted view comments to store predicates. #define PREDICATE_KEY "predicates" /**< The key used in the json-formatted view comments to store predicates.