From c5f3fdc295cd406e44c7734a3bc4f83e11f8ba1c Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Thu, 27 Jul 2017 19:44:49 +0200 Subject: [PATCH] Increased maximum element names length in columns --- src/obidmscolumn.c | 2 +- src/obidmscolumn.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/obidmscolumn.c b/src/obidmscolumn.c index cfac5ab..e3fdbc4 100644 --- a/src/obidmscolumn.c +++ b/src/obidmscolumn.c @@ -615,7 +615,7 @@ static int set_elements_names(OBIDMS_column_p column, char* elements_names, int if (elts_names_length+2 > ELEMENTS_NAMES_MAX) { obi_set_errno(OBICOL_UNKNOWN_ERROR); - obidebug(1, "\nError: element names too long (max: %d)", ELEMENTS_NAMES_MAX); + obidebug(1, "\nError: element names too long (%d, max: %d)", elts_names_length+2, ELEMENTS_NAMES_MAX); return -1; } diff --git a/src/obidmscolumn.h b/src/obidmscolumn.h index d828932..5687cd6 100644 --- a/src/obidmscolumn.h +++ b/src/obidmscolumn.h @@ -28,10 +28,10 @@ #include "obiblob_indexer.h" -#define ELEMENTS_NAMES_MAX (2048) /**< The maximum length of the list of elements names. // TODO Discuss +#define ELEMENTS_NAMES_MAX (10240) /**< The maximum length of the list of elements names. // TODO Discuss */ -#define NB_ELTS_MAX_IF_DEFAULT_NAME (539) /**< The maximum number of elements per line if the default element names - * are used ("0\01\02\0...\0n"), considering ELEMENTS_NAMES_MAX. +#define NB_ELTS_MAX_IF_DEFAULT_NAME (10240) /**< The maximum number of elements per line if the default element names + * are used ("0\01\02\0...\0n"), considering ELEMENTS_NAMES_MAX. // TODO not up to date */ #define COLUMN_GROWTH_FACTOR (2) /**< The growth factor when a column is enlarged. */