From 26b8e1f215233ce3cc0ad79c97b7c47e8b77c8be Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Tue, 2 Aug 2016 16:33:19 +0200 Subject: [PATCH] Modified C API to set and get in columns: added functions to set and get using column names instead of pointers, and changed function names --- .../obitools3/obidms/_obidmscolumn_bool.pyx | 18 +- .../obitools3/obidms/_obidmscolumn_char.pyx | 18 +- .../obitools3/obidms/_obidmscolumn_float.pyx | 18 +- python/obitools3/obidms/_obidmscolumn_int.pyx | 18 +- .../obitools3/obidms/_obidmscolumn_qual.pyx | 44 +- python/obitools3/obidms/_obidmscolumn_seq.pyx | 20 +- python/obitools3/obidms/_obidmscolumn_str.pyx | 20 +- python/obitools3/obidms/capi/obiview.pxd | 142 +++--- src/obiview.c | 426 +++++++++++++++--- src/obiview.h | 201 +++++++-- 10 files changed, 691 insertions(+), 234 deletions(-) diff --git a/python/obitools3/obidms/_obidmscolumn_bool.pyx b/python/obitools3/obidms/_obidmscolumn_bool.pyx index fcef66c..12fa15b 100644 --- a/python/obitools3/obidms/_obidmscolumn_bool.pyx +++ b/python/obitools3/obidms/_obidmscolumn_bool.pyx @@ -1,9 +1,9 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obibool_with_elt_name_in_view, \ - obi_column_get_obibool_with_elt_idx_in_view, \ - obi_column_set_obibool_with_elt_name_in_view, \ - obi_column_set_obibool_with_elt_idx_in_view +from .capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_view, \ + obi_get_bool_with_elt_idx_and_col_p_in_view, \ + obi_set_bool_with_elt_name_and_col_p_in_view, \ + obi_set_bool_with_elt_idx_and_col_p_in_view from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBIBool_NA, obibool_t @@ -17,7 +17,7 @@ cdef class OBIDMS_column_bool(OBIDMS_column): cpdef object get_line(self, index_t line_nb): cdef obibool_t value cdef object result - value = obi_column_get_obibool_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_bool_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIBool_NA : @@ -29,7 +29,7 @@ cdef class OBIDMS_column_bool(OBIDMS_column): cpdef set_line(self, index_t line_nb, object value): if value is None : value = OBIBool_NA - if obi_column_set_obibool_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value) < 0: + if obi_set_bool_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value) < 0: raise Exception("Problem setting a value in a column") @@ -38,7 +38,7 @@ cdef class OBIDMS_column_multi_elts_bool(OBIDMS_column_multi_elts): cpdef object get_item(self, index_t line_nb, str element_name): cdef obibool_t value cdef object result - value = obi_column_get_obibool_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_bool_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIBool_NA : @@ -56,7 +56,7 @@ cdef class OBIDMS_column_multi_elts_bool(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obibool_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_bool_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIBool_NA : @@ -73,5 +73,5 @@ cdef class OBIDMS_column_multi_elts_bool(OBIDMS_column_multi_elts): cpdef set_item(self, index_t line_nb, str element_name, object value): if value is None : value = OBIBool_NA - if obi_column_set_obibool_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value) < 0: + if obi_set_bool_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value) < 0: raise Exception("Problem setting a value in a column") diff --git a/python/obitools3/obidms/_obidmscolumn_char.pyx b/python/obitools3/obidms/_obidmscolumn_char.pyx index 080885d..231f0fe 100644 --- a/python/obitools3/obidms/_obidmscolumn_char.pyx +++ b/python/obitools3/obidms/_obidmscolumn_char.pyx @@ -1,9 +1,9 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obichar_with_elt_name_in_view, \ - obi_column_get_obichar_with_elt_idx_in_view, \ - obi_column_set_obichar_with_elt_name_in_view, \ - obi_column_set_obichar_with_elt_idx_in_view +from .capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_view, \ + obi_get_char_with_elt_idx_and_col_p_in_view, \ + obi_set_char_with_elt_name_and_col_p_in_view, \ + obi_set_char_with_elt_idx_and_col_p_in_view from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBIChar_NA, obichar_t @@ -15,7 +15,7 @@ cdef class OBIDMS_column_char(OBIDMS_column): cpdef object get_line(self, index_t line_nb): cdef obichar_t value cdef object result - value = obi_column_get_obichar_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIChar_NA : @@ -27,7 +27,7 @@ cdef class OBIDMS_column_char(OBIDMS_column): cpdef set_line(self, index_t line_nb, object value): if value is None : value = OBIChar_NA - if obi_column_set_obichar_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)[0]) < 0: + if obi_set_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)[0]) < 0: raise Exception("Problem setting a value in a column") @@ -36,7 +36,7 @@ cdef class OBIDMS_column_multi_elts_char(OBIDMS_column_multi_elts): cpdef object get_item(self, index_t line_nb, str element_name): cdef obichar_t value cdef object result - value = obi_column_get_obichar_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_char_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIChar_NA : @@ -54,7 +54,7 @@ cdef class OBIDMS_column_multi_elts_char(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obichar_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIChar_NA : @@ -71,6 +71,6 @@ cdef class OBIDMS_column_multi_elts_char(OBIDMS_column_multi_elts): cpdef set_item(self, index_t line_nb, str element_name, object value): if value is None : value = OBIChar_NA - if obi_column_set_obichar_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), str2bytes(value)[0]) < 0: + if obi_set_char_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), str2bytes(value)[0]) < 0: raise Exception("Problem setting a value in a column") diff --git a/python/obitools3/obidms/_obidmscolumn_float.pyx b/python/obitools3/obidms/_obidmscolumn_float.pyx index 1bd325e..b1c1df2 100644 --- a/python/obitools3/obidms/_obidmscolumn_float.pyx +++ b/python/obitools3/obidms/_obidmscolumn_float.pyx @@ -1,9 +1,9 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obifloat_with_elt_name_in_view, \ - obi_column_get_obifloat_with_elt_idx_in_view, \ - obi_column_set_obifloat_with_elt_name_in_view, \ - obi_column_set_obifloat_with_elt_idx_in_view +from .capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in_view, \ + obi_get_float_with_elt_idx_and_col_p_in_view, \ + obi_set_float_with_elt_name_and_col_p_in_view, \ + obi_set_float_with_elt_idx_and_col_p_in_view from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBIFloat_NA, obifloat_t @@ -15,7 +15,7 @@ cdef class OBIDMS_column_float(OBIDMS_column): cpdef object get_line(self, index_t line_nb): cdef obifloat_t value cdef object result - value = obi_column_get_obifloat_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_float_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIFloat_NA : @@ -27,7 +27,7 @@ cdef class OBIDMS_column_float(OBIDMS_column): cpdef set_line(self, index_t line_nb, object value): if value is None : value = OBIFloat_NA - if obi_column_set_obifloat_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value) < 0: + if obi_set_float_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value) < 0: raise Exception("Problem setting a value in a column") @@ -36,7 +36,7 @@ cdef class OBIDMS_column_multi_elts_float(OBIDMS_column_multi_elts): cpdef object get_item(self, index_t line_nb, str element_name): cdef obifloat_t value cdef object result - value = obi_column_get_obifloat_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_float_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIFloat_NA : @@ -54,7 +54,7 @@ cdef class OBIDMS_column_multi_elts_float(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obifloat_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_float_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIFloat_NA : @@ -71,6 +71,6 @@ cdef class OBIDMS_column_multi_elts_float(OBIDMS_column_multi_elts): cpdef set_item(self, index_t line_nb, str element_name, object value): if value is None : value = OBIFloat_NA - if obi_column_set_obifloat_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value) < 0: + if obi_set_float_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value) < 0: raise Exception("Problem setting a value in a column") \ No newline at end of file diff --git a/python/obitools3/obidms/_obidmscolumn_int.pyx b/python/obitools3/obidms/_obidmscolumn_int.pyx index 8239bc7..42b4b9c 100644 --- a/python/obitools3/obidms/_obidmscolumn_int.pyx +++ b/python/obitools3/obidms/_obidmscolumn_int.pyx @@ -1,9 +1,9 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obiint_with_elt_name_in_view, \ - obi_column_get_obiint_with_elt_idx_in_view, \ - obi_column_set_obiint_with_elt_name_in_view, \ - obi_column_set_obiint_with_elt_idx_in_view +from .capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_view, \ + obi_get_int_with_elt_idx_and_col_p_in_view, \ + obi_set_int_with_elt_name_and_col_p_in_view, \ + obi_set_int_with_elt_idx_and_col_p_in_view from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBIInt_NA, obiint_t @@ -17,7 +17,7 @@ cdef class OBIDMS_column_int(OBIDMS_column): cpdef object get_line(self, index_t line_nb): cdef obiint_t value cdef object result - value = obi_column_get_obiint_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIInt_NA : @@ -29,7 +29,7 @@ cdef class OBIDMS_column_int(OBIDMS_column): cpdef set_line(self, index_t line_nb, object value): if value is None : value = OBIInt_NA - if obi_column_set_obiint_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value) < 0: + if obi_set_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value) < 0: raise Exception("Problem setting a value in a column") @@ -38,7 +38,7 @@ cdef class OBIDMS_column_multi_elts_int(OBIDMS_column_multi_elts): cpdef object get_item(self, index_t line_nb, str element_name): cdef obiint_t value cdef object result - value = obi_column_get_obiint_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_int_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIInt_NA : @@ -56,7 +56,7 @@ cdef class OBIDMS_column_multi_elts_int(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obiint_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIInt_NA : @@ -73,6 +73,6 @@ cdef class OBIDMS_column_multi_elts_int(OBIDMS_column_multi_elts): cpdef set_item(self, index_t line_nb, str element_name, object value): if value is None : value = OBIInt_NA - if obi_column_set_obiint_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value) < 0: + if obi_set_int_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value) < 0: raise Exception("Problem setting a value in a column") diff --git a/python/obitools3/obidms/_obidmscolumn_qual.pyx b/python/obitools3/obidms/_obidmscolumn_qual.pyx index 7b6f74a..00d82ab 100644 --- a/python/obitools3/obidms/_obidmscolumn_qual.pyx +++ b/python/obitools3/obidms/_obidmscolumn_qual.pyx @@ -1,13 +1,13 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obiqual_char_with_elt_name_in_view, \ - obi_column_get_obiqual_char_with_elt_idx_in_view, \ - obi_column_set_obiqual_char_with_elt_name_in_view, \ - obi_column_set_obiqual_char_with_elt_idx_in_view, \ - obi_column_get_obiqual_int_with_elt_name_in_view, \ - obi_column_get_obiqual_int_with_elt_idx_in_view, \ - obi_column_set_obiqual_int_with_elt_name_in_view, \ - obi_column_set_obiqual_int_with_elt_idx_in_view +from .capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_p_in_view, \ + obi_get_qual_char_with_elt_idx_and_col_p_in_view, \ + obi_set_qual_char_with_elt_name_and_col_p_in_view, \ + obi_set_qual_char_with_elt_idx_and_col_p_in_view, \ + obi_get_qual_int_with_elt_name_and_col_p_in_view, \ + obi_get_qual_int_with_elt_idx_and_col_p_in_view, \ + obi_set_qual_int_with_elt_name_and_col_p_in_view, \ + obi_set_qual_int_with_elt_idx_and_col_p_in_view from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBIQual_char_NA, OBIQual_int_NA, const_char_p @@ -29,7 +29,7 @@ cdef class OBIDMS_column_qual(OBIDMS_column): cdef int value_length cdef object result cdef int i - value = obi_column_get_obiqual_int_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, &value_length) + value = obi_get_qual_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, &value_length) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIQual_int_NA : @@ -44,7 +44,7 @@ cdef class OBIDMS_column_qual(OBIDMS_column): cdef char* value cdef object result cdef int i - value = obi_column_get_obiqual_char_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_qual_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIQual_char_NA : @@ -58,23 +58,23 @@ cdef class OBIDMS_column_qual(OBIDMS_column): cdef uint8_t* value_b cdef int value_length if value is None : - if obi_column_set_obiqual_int_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBIQual_int_NA, 0) < 0: + if obi_set_qual_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBIQual_int_NA, 0) < 0: raise Exception("Problem setting a value in a column") else : value_length = len(value) value_b = malloc(value_length * sizeof(uint8_t)) for i in range(value_length) : value_b[i] = value[i] - if obi_column_set_obiqual_int_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value_b, value_length) < 0: + if obi_set_qual_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, value_b, value_length) < 0: raise Exception("Problem setting a value in a column") free(value_b) cpdef set_str_line(self, index_t line_nb, object value): if value is None : - if obi_column_set_obiqual_char_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBIQual_char_NA) < 0: + if obi_set_qual_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBIQual_char_NA) < 0: raise Exception("Problem setting a value in a column") else : - if obi_column_set_obiqual_char_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)) < 0: + if obi_set_qual_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)) < 0: raise Exception("Problem setting a value in a column") @@ -85,7 +85,7 @@ cdef class OBIDMS_column_multi_elts_qual(OBIDMS_column_multi_elts): cdef int value_length cdef object result cdef int i - value = obi_column_get_obiqual_int_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), &value_length) + value = obi_get_qual_int_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), &value_length) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIQual_int_NA : @@ -99,7 +99,7 @@ cdef class OBIDMS_column_multi_elts_qual(OBIDMS_column_multi_elts): cpdef object get_str_item(self, index_t line_nb, str element_name): cdef char* value cdef object result - value = obi_column_get_obiqual_char_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_qual_char_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIQual_char_NA : @@ -120,7 +120,7 @@ cdef class OBIDMS_column_multi_elts_qual(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obiqual_int_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i, &value_length) + value = obi_get_qual_int_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i, &value_length) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIQual_int_NA : @@ -145,7 +145,7 @@ cdef class OBIDMS_column_multi_elts_qual(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obiqual_char_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_qual_char_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIQual_char_NA : @@ -164,21 +164,21 @@ cdef class OBIDMS_column_multi_elts_qual(OBIDMS_column_multi_elts): cdef uint8_t* value_b cdef int value_length if value is None : - if obi_column_set_obiqual_int_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), OBIQual_int_NA, 0) < 0: + if obi_set_qual_int_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), OBIQual_int_NA, 0) < 0: raise Exception("Problem setting a value in a column") else : value_length = len(value) value_b = malloc(value_length * sizeof(uint8_t)) for i in range(value_length) : value_b[i] = value[i] - if obi_column_set_obiqual_int_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value_b, value_length) < 0: + if obi_set_qual_int_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value_b, value_length) < 0: raise Exception("Problem setting a value in a column") free(value_b) cpdef set_str_item(self, index_t line_nb, str element_name, object value): if value is None : - if obi_column_set_obiqual_char_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), OBIQual_char_NA) < 0: + if obi_set_qual_char_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), OBIQual_char_NA) < 0: raise Exception("Problem setting a value in a column") else : - if obi_column_set_obiqual_char_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), str2bytes(value)) < 0: + if obi_set_qual_char_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), str2bytes(value)) < 0: raise Exception("Problem setting a value in a column") diff --git a/python/obitools3/obidms/_obidmscolumn_seq.pyx b/python/obitools3/obidms/_obidmscolumn_seq.pyx index 2cf6b93..134289c 100644 --- a/python/obitools3/obidms/_obidmscolumn_seq.pyx +++ b/python/obitools3/obidms/_obidmscolumn_seq.pyx @@ -1,9 +1,9 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obiseq_with_elt_name_in_view, \ - obi_column_get_obiseq_with_elt_idx_in_view, \ - obi_column_set_obiseq_with_elt_name_in_view, \ - obi_column_set_obiseq_with_elt_idx_in_view +from .capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_view, \ + obi_get_seq_with_elt_idx_and_col_p_in_view, \ + obi_set_seq_with_elt_name_and_col_p_in_view, \ + obi_set_seq_with_elt_idx_and_col_p_in_view from .capi.obialign cimport obi_align_one_column from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBISeq_NA, const_char_p @@ -20,7 +20,7 @@ cdef class OBIDMS_column_seq(OBIDMS_column): cpdef object get_line(self, index_t line_nb): cdef char* value cdef object result - value = obi_column_get_obiseq_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_seq_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBISeq_NA : @@ -32,10 +32,10 @@ cdef class OBIDMS_column_seq(OBIDMS_column): cpdef set_line(self, index_t line_nb, object value): if value is None : - if obi_column_set_obiseq_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBISeq_NA) < 0: + if obi_set_seq_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBISeq_NA) < 0: raise Exception("Problem setting a value in a column") else : - if obi_column_set_obiseq_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)) < 0: + if obi_set_seq_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)) < 0: raise Exception("Problem setting a value in a column") # TODO choose alignment type (lcs or other) with supplementary argument @@ -56,7 +56,7 @@ cdef class OBIDMS_column_multi_elts_seq(OBIDMS_column_multi_elts): cpdef object get_item(self, index_t line_nb, str element_name): cdef char* value cdef object result - value = obi_column_get_obiseq_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_seq_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBISeq_NA : @@ -75,7 +75,7 @@ cdef class OBIDMS_column_multi_elts_seq(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obiseq_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_seq_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBISeq_NA : @@ -102,7 +102,7 @@ cdef class OBIDMS_column_multi_elts_seq(OBIDMS_column_multi_elts): else: raise TypeError('Sequence value must be of type Bytes, Str or None') - if obi_column_set_obiseq_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value_b) < 0: + if obi_set_seq_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value_b) < 0: raise Exception("Problem setting a value in a column") # cpdef align(self, ): # TODO diff --git a/python/obitools3/obidms/_obidmscolumn_str.pyx b/python/obitools3/obidms/_obidmscolumn_str.pyx index 2382ca9..aaa5366 100644 --- a/python/obitools3/obidms/_obidmscolumn_str.pyx +++ b/python/obitools3/obidms/_obidmscolumn_str.pyx @@ -1,9 +1,9 @@ #cython: language_level=3 -from .capi.obiview cimport obi_column_get_obistr_with_elt_name_in_view, \ - obi_column_get_obistr_with_elt_idx_in_view, \ - obi_column_set_obistr_with_elt_name_in_view, \ - obi_column_set_obistr_with_elt_idx_in_view +from .capi.obiview cimport obi_get_str_with_elt_name_and_col_p_in_view, \ + obi_get_str_with_elt_idx_and_col_p_in_view, \ + obi_set_str_with_elt_name_and_col_p_in_view, \ + obi_set_str_with_elt_idx_and_col_p_in_view from .capi.obierrno cimport obi_errno from .capi.obitypes cimport OBIStr_NA, const_char_p @@ -15,7 +15,7 @@ cdef class OBIDMS_column_str(OBIDMS_column): cpdef object get_line(self, index_t line_nb): cdef const_char_p value cdef object result - value = obi_column_get_obistr_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) + value = obi_get_str_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIStr_NA : @@ -27,10 +27,10 @@ cdef class OBIDMS_column_str(OBIDMS_column): cpdef set_line(self, index_t line_nb, object value): if value is None : - if obi_column_set_obistr_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBIStr_NA) < 0: + if obi_set_str_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, OBIStr_NA) < 0: raise Exception("Problem setting a value in a column") else : - if obi_column_set_obistr_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)) < 0: + if obi_set_str_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, 0, str2bytes(value)) < 0: raise Exception("Problem setting a value in a column") @@ -39,7 +39,7 @@ cdef class OBIDMS_column_multi_elts_str(OBIDMS_column_multi_elts): cpdef object get_item(self, index_t line_nb, str element_name): cdef const_char_p value cdef object result - value = obi_column_get_obistr_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) + value = obi_get_str_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name)) if obi_errno > 0 : raise IndexError(line_nb, element_name) if value == OBIStr_NA : @@ -58,7 +58,7 @@ cdef class OBIDMS_column_multi_elts_str(OBIDMS_column_multi_elts): result = {} all_NA = True for i in range(self.nb_elements_per_line) : - value = obi_column_get_obistr_with_elt_idx_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) + value = obi_get_str_with_elt_idx_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, i) if obi_errno > 0 : raise IndexError(line_nb) if value == OBIStr_NA : @@ -79,6 +79,6 @@ cdef class OBIDMS_column_multi_elts_str(OBIDMS_column_multi_elts): value_b = OBIStr_NA else : value_b = str2bytes(value) - if obi_column_set_obistr_with_elt_name_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value_b) < 0: + if obi_set_str_with_elt_name_and_col_p_in_view(self.view.pointer, (self.pointer)[0], line_nb, str2bytes(element_name), value_b) < 0: raise Exception("Problem setting a value in a column") diff --git a/python/obitools3/obidms/capi/obiview.pxd b/python/obitools3/obidms/capi/obiview.pxd index 1c00241..efd8f48 100644 --- a/python/obitools3/obidms/capi/obiview.pxd +++ b/python/obitools3/obidms/capi/obiview.pxd @@ -107,183 +107,197 @@ cdef extern from "obiview.h" nogil: int obi_save_and_close_view(Obiview_p view) - int obi_column_set_obiint_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_INT + int obi_set_int_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name, obiint_t value) - int obi_column_set_obiint_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_int_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obiint_t value) - obiint_t obi_column_get_obiint_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + obiint_t obi_get_int_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name) - obiint_t obi_column_get_obiint_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + obiint_t obi_get_int_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) - int obi_column_set_obibool_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_BOOL + int obi_set_bool_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name, obibool_t value) - int obi_column_set_obibool_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_bool_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obibool_t value) - obibool_t obi_column_get_obibool_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + obibool_t obi_get_bool_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name) - obibool_t obi_column_get_obibool_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + obibool_t obi_get_bool_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) - int obi_column_set_obichar_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_CHAR + int obi_set_char_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name, obichar_t value) - int obi_column_set_obichar_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_char_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obichar_t value) - obichar_t obi_column_get_obichar_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + obichar_t obi_get_char_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name) - obichar_t obi_column_get_obichar_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + obichar_t obi_get_char_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) - int obi_column_set_obifloat_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_FLOAT + int obi_set_float_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name, obifloat_t value) - int obi_column_set_obifloat_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_float_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obifloat_t value) - obifloat_t obi_column_get_obifloat_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + obifloat_t obi_get_float_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name) - obifloat_t obi_column_get_obifloat_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + obifloat_t obi_get_float_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) - int obi_column_set_obiqual_char_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_QUAL + int obi_set_qual_char_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const char* value) - int obi_column_set_obiqual_int_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_qual_int_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length) - char* obi_column_get_obiqual_char_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + char* obi_get_qual_char_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) - const uint8_t* obi_column_get_obiqual_int_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + const uint8_t* obi_get_qual_int_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, int* value_length) - int obi_column_set_obiqual_char_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_qual_char_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const char* element_name, const char* value) - int obi_column_set_obiqual_int_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_qual_int_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const char* element_name, const uint8_t* value, int value_length) - char* obi_column_get_obiqual_char_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + char* obi_get_qual_char_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const char* element_name) - const uint8_t* obi_column_get_obiqual_int_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + const uint8_t* obi_get_qual_int_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const char* element_name, int* value_length) - int obi_column_set_obistr_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_STR + int obi_set_str_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name, const_char_p value) - int obi_column_set_obistr_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_str_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const_char_p value) - const_char_p obi_column_get_obistr_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + const_char_p obi_get_str_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name) - const_char_p obi_column_get_obistr_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + const_char_p obi_get_str_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) - int obi_column_set_obiseq_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + + # OBI_SEQ + int obi_set_seq_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name, const_char_p value) - int obi_column_set_obiseq_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + int obi_set_seq_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const_char_p value) - char* obi_column_get_obiseq_with_elt_name_in_view(Obiview_p view, - OBIDMS_column_p column, + char* obi_get_seq_with_elt_name_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, const_char_p element_name) - char* obi_column_get_obiseq_with_elt_idx_in_view(Obiview_p view, - OBIDMS_column_p column, + char* obi_get_seq_with_elt_idx_and_col_p_in_view(Obiview_p view, + OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) diff --git a/src/obiview.c b/src/obiview.c index add3e42..49bfc8d 100644 --- a/src/obiview.c +++ b/src/obiview.c @@ -1791,37 +1791,77 @@ int obi_save_and_close_view(Obiview_p view) /*********** FOR BOOL COLUMNS ***********/ -int obi_column_set_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obibool_t value) +int obi_set_bool_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obibool_t value) { - if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) + if (prepare_to_set_value_in_column(view, &column_p, &line_nb) < 0) return -1; - return obi_column_set_obibool_with_elt_idx(column, line_nb, element_idx, value); + return obi_column_set_obibool_with_elt_idx(column_p, line_nb, element_idx, value); } -obibool_t obi_column_get_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +obibool_t obi_get_bool_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIBool_NA; - return obi_column_get_obibool_with_elt_idx(column, line_nb, element_idx); + return obi_column_get_obibool_with_elt_idx(column_p, line_nb, element_idx); } -int obi_column_set_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obibool_t value) +int obi_set_bool_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, obibool_t value) { - index_t element_idx = obi_column_get_element_index_from_name(column, element_name); + index_t element_idx = obi_column_get_element_index_from_name(column_p, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obibool_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_bool_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); } -obibool_t obi_column_get_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +obibool_t obi_get_bool_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name) { - index_t element_idx = obi_column_get_element_index_from_name(column, element_name); + index_t element_idx = obi_column_get_element_index_from_name(column_p, element_name); if (element_idx == OBIIdx_NA) return OBIBool_NA; - return obi_column_get_obibool_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_bool_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +int obi_set_bool_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obibool_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_bool_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_bool_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obibool_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_bool_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +obibool_t obi_get_bool_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIBool_NA; + return obi_get_bool_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +obibool_t obi_get_bool_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIBool_NA; + return obi_get_bool_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); } /****************************************/ @@ -1829,7 +1869,7 @@ obibool_t obi_column_get_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_co /*********** FOR CHAR COLUMNS ***********/ -int obi_column_set_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obichar_t value) +int obi_set_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obichar_t value) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -1837,7 +1877,7 @@ int obi_column_set_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p } -obichar_t obi_column_get_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +obichar_t obi_get_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIChar_NA; @@ -1845,21 +1885,61 @@ obichar_t obi_column_get_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_col } -int obi_column_set_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obichar_t value) +int obi_set_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obichar_t value) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obichar_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_char_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value); } -obichar_t obi_column_get_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +obichar_t obi_get_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBIChar_NA; - return obi_column_get_obichar_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_char_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx); +} + + +int obi_set_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obichar_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_char_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obichar_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_char_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +obichar_t obi_get_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIChar_NA; + return obi_get_char_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +obichar_t obi_get_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIChar_NA; + return obi_get_char_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); } /****************************************/ @@ -1867,7 +1947,7 @@ obichar_t obi_column_get_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_co /*********** FOR FLOAT COLUMNS ***********/ -int obi_column_set_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obifloat_t value) +int obi_set_float_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obifloat_t value) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -1875,7 +1955,7 @@ int obi_column_set_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p } -obifloat_t obi_column_get_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +obifloat_t obi_get_float_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIFloat_NA; @@ -1883,21 +1963,61 @@ obifloat_t obi_column_get_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_c } -int obi_column_set_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obifloat_t value) +int obi_set_float_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obifloat_t value) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obifloat_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_float_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value); } -obifloat_t obi_column_get_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +obifloat_t obi_get_float_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBIFloat_NA; - return obi_column_get_obifloat_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_float_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx); +} + + +int obi_set_float_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obifloat_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_float_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_float_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obifloat_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_float_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +obifloat_t obi_get_float_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIFloat_NA; + return obi_get_float_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +obifloat_t obi_get_float_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIFloat_NA; + return obi_get_float_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); } /****************************************/ @@ -1905,7 +2025,7 @@ obifloat_t obi_column_get_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_ /*********** FOR INT COLUMNS ***********/ -int obi_column_set_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obiint_t value) +int obi_set_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obiint_t value) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -1913,7 +2033,7 @@ int obi_column_set_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p c } -obiint_t obi_column_get_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +obiint_t obi_get_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIInt_NA; @@ -1921,21 +2041,61 @@ obiint_t obi_column_get_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_colum } -int obi_column_set_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obiint_t value) +int obi_set_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obiint_t value) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obiint_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_int_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value); } -obiint_t obi_column_get_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +obiint_t obi_get_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBIInt_NA; - return obi_column_get_obiint_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_int_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx); +} + + +int obi_set_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obiint_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_int_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obiint_t value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_int_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +obiint_t obi_get_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIInt_NA; + return obi_get_int_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +obiint_t obi_get_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIInt_NA; + return obi_get_int_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); } /****************************************/ @@ -1943,7 +2103,7 @@ obiint_t obi_column_get_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_colu /*********** FOR QUAL COLUMNS ***********/ -int obi_column_set_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value) +int obi_set_qual_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -1951,7 +2111,7 @@ int obi_column_set_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_colu } -int obi_column_set_obiqual_int_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length) +int obi_set_qual_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -1959,7 +2119,7 @@ int obi_column_set_obiqual_int_with_elt_idx_in_view(Obiview_p view, OBIDMS_colum } -char* obi_column_get_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +char* obi_get_qual_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIQual_char_NA; @@ -1967,7 +2127,7 @@ char* obi_column_get_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_co } -const uint8_t* obi_column_get_obiqual_int_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, int* value_length) +const uint8_t* obi_get_qual_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, int* value_length) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIQual_int_NA; @@ -1975,39 +2135,119 @@ const uint8_t* obi_column_get_obiqual_int_with_elt_idx_in_view(Obiview_p view, O } -int obi_column_set_obiqual_char_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value) +int obi_set_qual_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obiqual_char_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_qual_char_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value); } -int obi_column_set_obiqual_int_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const uint8_t* value, int value_length) +int obi_set_qual_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const uint8_t* value, int value_length) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obiqual_int_with_elt_idx_in_view(view, column, line_nb, element_idx, value, value_length); + return obi_set_qual_int_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value, value_length); } -char* obi_column_get_obiqual_char_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +char* obi_get_qual_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBIQual_char_NA; - return obi_column_get_obiqual_char_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_qual_char_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx); } -const uint8_t* obi_column_get_obiqual_int_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, int* value_length) +const uint8_t* obi_get_qual_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, int* value_length) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBIQual_int_NA; - return obi_column_get_obiqual_int_with_elt_idx_in_view(view, column, line_nb, element_idx, value_length); + return obi_get_qual_int_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value_length); +} + + +int obi_set_qual_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const char* value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_qual_char_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_qual_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const char* value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_qual_char_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +char* obi_get_qual_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIQual_char_NA; + return obi_get_qual_char_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +char* obi_get_qual_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIQual_char_NA; + return obi_get_qual_char_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); +} + + +int obi_set_qual_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const uint8_t* value, int value_length) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_qual_int_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value, value_length); +} + + +int obi_set_qual_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_qual_int_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value, value_length); +} + + +const uint8_t* obi_get_qual_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, int* value_length) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIQual_int_NA; + return obi_get_qual_int_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value_length); +} + + +const uint8_t* obi_get_qual_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, int* value_length) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIQual_int_NA; + return obi_get_qual_int_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value_length); } /****************************************/ @@ -2015,7 +2255,7 @@ const uint8_t* obi_column_get_obiqual_int_with_elt_name_in_view(Obiview_p view, /*********** FOR SEQ COLUMNS ***********/ -int obi_column_set_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value) +int obi_set_seq_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -2023,7 +2263,7 @@ int obi_column_set_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p c } -char* obi_column_get_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +char* obi_get_seq_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBISeq_NA; @@ -2031,21 +2271,61 @@ char* obi_column_get_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p } -int obi_column_set_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value) +int obi_set_seq_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obiseq_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_seq_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value); } -char* obi_column_get_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +char* obi_get_seq_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBISeq_NA; - return obi_column_get_obiseq_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_seq_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx); +} + + +int obi_set_seq_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const char* value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_seq_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_seq_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const char* value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_seq_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +char* obi_get_seq_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBISeq_NA; + return obi_get_seq_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +char* obi_get_seq_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBISeq_NA; + return obi_get_seq_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); } /****************************************/ @@ -2053,7 +2333,7 @@ char* obi_column_get_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_ /*********** FOR STR COLUMNS ***********/ -int obi_column_set_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value) +int obi_set_str_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value) { if (prepare_to_set_value_in_column(view, &column, &line_nb) < 0) return -1; @@ -2061,7 +2341,7 @@ int obi_column_set_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p c } -const char* obi_column_get_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) +const char* obi_get_str_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx) { if (prepare_to_get_value_from_column(view, &line_nb) < 0) return OBIStr_NA; @@ -2069,21 +2349,61 @@ const char* obi_column_get_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_co } -int obi_column_set_obistr_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value) +int obi_set_str_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return -1; - return obi_column_set_obistr_with_elt_idx_in_view(view, column, line_nb, element_idx, value); + return obi_set_str_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx, value); } -const char* obi_column_get_obistr_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) +const char* obi_get_str_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name) { index_t element_idx = obi_column_get_element_index_from_name(column, element_name); if (element_idx == OBIIdx_NA) return OBIStr_NA; - return obi_column_get_obistr_with_elt_idx_in_view(view, column, line_nb, element_idx); + return obi_get_str_with_elt_idx_and_col_p_in_view(view, column, line_nb, element_idx); +} + + +int obi_set_str_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const char* value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_str_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name, value); +} + + +int obi_set_str_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const char* value) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return -1; + return obi_set_str_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx, value); +} + + +const char* obi_get_str_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIStr_NA; + return obi_get_str_with_elt_idx_and_col_p_in_view(view, column_p, line_nb, element_idx); +} + + +const char* obi_get_str_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name) +{ + OBIDMS_column_p column_p; + column_p = obi_view_get_column(view, column_name); + if (column_p == NULL) + return OBIStr_NA; + return obi_get_str_with_elt_name_and_col_p_in_view(view, column_p, line_nb, element_name); } /****************************************/ diff --git a/src/obiview.h b/src/obiview.h index e3d7a20..eefd4ef 100644 --- a/src/obiview.h +++ b/src/obiview.h @@ -489,9 +489,6 @@ int obi_close_view(Obiview_p view); int obi_save_and_close_view(Obiview_p view); -// in following functions would it be better to use column names instead of column pointers? -// check if it would be a gain or loss of time - /** * @brief Sets a value in an OBIDMS column containing data with the type OBI_BOOL, using the index of the element in the line, * in the context of a view. @@ -499,7 +496,7 @@ int obi_save_and_close_view(Obiview_p view); * Note: If the column is read-only or if there is a line selection associated with the view (making columns non-writable), it is cloned. * * @param view A pointer on the opened writable view. - * @param column A pointer on the column. + * @param column_p A pointer on the column. * @param line_nb The number of the line where the value should be set. * @param element_idx The index of the element that should be set in the line. * @param value The value that should be set. @@ -511,14 +508,17 @@ int obi_save_and_close_view(Obiview_p view); * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obibool_t value); +int obi_set_bool_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obibool_t value); + +// TODO +int obi_set_bool_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obibool_t value); /** * @brief Recovers a value in an OBIDMS column containing data with the type OBI_BOOL, in the context of a view. * * @param view A pointer on the opened view. - * @param column A pointer on the column. + * @param column_p A pointer on the column. * @param line_nb The number of the line where the value should be recovered. * @param element_idx The index of the element that should be recovered in the line. * @@ -528,7 +528,10 @@ int obi_column_set_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obibool_t obi_column_get_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +obibool_t obi_get_bool_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + +// TODO +obibool_t obi_get_bool_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -536,7 +539,7 @@ obibool_t obi_column_get_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_col * using the name of the element in the line, in the context of a view. * * @param view A pointer on the opened writable view. - * @param column A pointer on the column. + * @param column_p A pointer on the column. * @param line_nb The number of the line where the value should be set. * @param element_name The name of the element that should be set in the line. * @param value The value that should be set. @@ -548,7 +551,11 @@ obibool_t obi_column_get_obibool_with_elt_idx_in_view(Obiview_p view, OBIDMS_col * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obibool_t value); +int obi_set_bool_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, obibool_t value); + + +// TODO +int obi_set_bool_with_elt_name_and_column_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obibool_t value); /** @@ -556,7 +563,7 @@ int obi_column_set_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p * using the name of the element in the line, in the context of a view. * * @param view A pointer on the opened view. - * @param column A pointer on the column. + * @param column_p A pointer on the column. * @param line_nb The number of the line where the value should be recovered. * @param element_name The name of the element that should be recovered in the line. * @@ -566,7 +573,11 @@ int obi_column_set_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obibool_t obi_column_get_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +obibool_t obi_get_bool_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +obibool_t obi_get_bool_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); /** @@ -588,7 +599,11 @@ obibool_t obi_column_get_obibool_with_elt_name_in_view(Obiview_p view, OBIDMS_co * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obichar_t value); +int obi_set_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obichar_t value); + + +// TODO +int obi_set_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obichar_t value); /** @@ -605,7 +620,11 @@ int obi_column_set_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obichar_t obi_column_get_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +obichar_t obi_get_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + + +// TODO +obichar_t obi_get_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -625,7 +644,11 @@ obichar_t obi_column_get_obichar_with_elt_idx_in_view(Obiview_p view, OBIDMS_col * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obichar_t value); +int obi_set_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, obichar_t value); + + +// TODO +int obi_set_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obichar_t value); /** @@ -643,7 +666,11 @@ int obi_column_set_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obichar_t obi_column_get_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +obichar_t obi_get_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +obichar_t obi_get_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); /** @@ -665,7 +692,11 @@ obichar_t obi_column_get_obichar_with_elt_name_in_view(Obiview_p view, OBIDMS_co * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obifloat_t value); +int obi_set_float_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obifloat_t value); + + +// TODO +int obi_set_float_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obifloat_t value); /** @@ -682,7 +713,11 @@ int obi_column_set_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obifloat_t obi_column_get_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +obifloat_t obi_get_float_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + + +// TODO +obifloat_t obi_get_float_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -702,7 +737,11 @@ obifloat_t obi_column_get_obifloat_with_elt_idx_in_view(Obiview_p view, OBIDMS_c * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obifloat_t value); +int obi_set_float_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, obifloat_t value); + + +// TODO +int obi_set_float_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obifloat_t value); /** @@ -720,7 +759,11 @@ int obi_column_set_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_column_ * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obifloat_t obi_column_get_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +obifloat_t obi_get_float_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +obifloat_t obi_get_float_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); /** @@ -742,7 +785,11 @@ obifloat_t obi_column_get_obifloat_with_elt_name_in_view(Obiview_p view, OBIDMS_ * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, obiint_t value); +int obi_set_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, obiint_t value); + + +// TODO +int obi_set_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, obiint_t value); /** @@ -759,7 +806,11 @@ int obi_column_set_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p c * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obiint_t obi_column_get_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +obiint_t obi_get_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + + +// TODO +obiint_t obi_get_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -779,7 +830,11 @@ obiint_t obi_column_get_obiint_with_elt_idx_in_view(Obiview_p view, OBIDMS_colum * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, obiint_t value); +int obi_set_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, obiint_t value); + + +// TODO +int obi_set_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, obiint_t value); /** @@ -797,7 +852,11 @@ int obi_column_set_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -obiint_t obi_column_get_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +obiint_t obi_get_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +obiint_t obi_get_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); /** @@ -822,7 +881,11 @@ obiint_t obi_column_get_obiint_with_elt_name_in_view(Obiview_p view, OBIDMS_colu * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value); +int obi_set_qual_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const char* value); + + +// TODO +int obi_set_qual_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const char* value); /** @@ -848,7 +911,11 @@ int obi_column_set_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_colu * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiqual_int_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length); +int obi_set_qual_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length); + + +// TODO +int obi_set_qual_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const uint8_t* value, int value_length); /** @@ -869,7 +936,11 @@ int obi_column_set_obiqual_int_with_elt_idx_in_view(Obiview_p view, OBIDMS_colum * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -char* obi_column_get_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +char* obi_get_qual_char_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + + +// TODO +char* obi_get_qual_char_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -891,7 +962,11 @@ char* obi_column_get_obiqual_char_with_elt_idx_in_view(Obiview_p view, OBIDMS_co * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -const uint8_t* obi_column_get_obiqual_int_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, int* value_length); +const uint8_t* obi_get_qual_int_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, int* value_length); + + +// TODO +const uint8_t* obi_get_qual_int_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, int* value_length); /** @@ -916,7 +991,11 @@ const uint8_t* obi_column_get_obiqual_int_with_elt_idx_in_view(Obiview_p view, O * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiqual_char_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value); +int obi_set_qual_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, const char* value); + + +// TODO +int obi_set_qual_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const char* value); /** @@ -942,7 +1021,11 @@ int obi_column_set_obiqual_char_with_elt_name_in_view(Obiview_p view, OBIDMS_col * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiqual_int_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const uint8_t* value, int value_length); +int obi_set_qual_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, const uint8_t* value, int value_length); + + +// TODO +int obi_set_qual_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const uint8_t* value, int value_length); /** @@ -963,7 +1046,11 @@ int obi_column_set_obiqual_int_with_elt_name_in_view(Obiview_p view, OBIDMS_colu * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -char* obi_column_get_obiqual_char_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +char* obi_get_qual_char_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +char* obi_get_qual_char_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); /** @@ -985,7 +1072,11 @@ char* obi_column_get_obiqual_char_with_elt_name_in_view(Obiview_p view, OBIDMS_c * @since May 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -const uint8_t* obi_column_get_obiqual_int_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, int* value_length); +const uint8_t* obi_get_qual_int_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, int* value_length); + + +// TODO +const uint8_t* obi_get_qual_int_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, int* value_length); /** @@ -1007,7 +1098,11 @@ const uint8_t* obi_column_get_obiqual_int_with_elt_name_in_view(Obiview_p view, * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value); +int obi_set_seq_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const char* value); + + +// TODO +int obi_set_seq_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const char* value); /** @@ -1024,7 +1119,11 @@ int obi_column_set_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p c * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -char* obi_column_get_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +char* obi_get_seq_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + + +// TODO +char* obi_get_seq_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -1044,7 +1143,11 @@ char* obi_column_get_obiseq_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value); +int obi_set_seq_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, const char* value); + + +// TODO +int obi_set_seq_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const char* value); /** @@ -1062,7 +1165,11 @@ int obi_column_set_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -char* obi_column_get_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +char* obi_get_seq_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +char* obi_get_seq_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); /** @@ -1084,7 +1191,11 @@ char* obi_column_get_obiseq_with_elt_name_in_view(Obiview_p view, OBIDMS_column_ * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx, const char* value); +int obi_set_str_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx, const char* value); + + +// TODO +int obi_set_str_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx, const char* value); /** @@ -1101,7 +1212,11 @@ int obi_column_set_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p c * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -const char* obi_column_get_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, index_t element_idx); +const char* obi_get_str_with_elt_idx_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, index_t element_idx); + + +// TODO +const char* obi_get_str_with_elt_idx_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, index_t element_idx); /** @@ -1121,7 +1236,11 @@ const char* obi_column_get_obistr_with_elt_idx_in_view(Obiview_p view, OBIDMS_co * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -int obi_column_set_obistr_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name, const char* value); +int obi_set_str_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name, const char* value); + + +// TODO +int obi_set_str_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name, const char* value); /** @@ -1139,7 +1258,11 @@ int obi_column_set_obistr_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p * @since February 2016 * @author Celine Mercier (celine.mercier@metabarcoding.org) */ -const char* obi_column_get_obistr_with_elt_name_in_view(Obiview_p view, OBIDMS_column_p column, index_t line_nb, const char* element_name); +const char* obi_get_str_with_elt_name_and_col_p_in_view(Obiview_p view, OBIDMS_column_p column_p, index_t line_nb, const char* element_name); + + +// TODO +const char* obi_get_str_with_elt_name_and_col_name_in_view(Obiview_p view, const char* column_name, index_t line_nb, const char* element_name); #endif /* OBIVIEW_H_ */