Major update: new type of columns containing indices referring to lines
in other columns
This commit is contained in:
Celine Mercier
@ -19,6 +19,7 @@ cdef class OBIDMS:
|
||||
str column_name,
|
||||
bint create=*,
|
||||
bint clone=*, bint clone_data=*,
|
||||
bint referring=*,
|
||||
obiversion_t version_number=*,
|
||||
str type=*,
|
||||
index_t nb_lines=*,
|
||||
@ -30,16 +31,19 @@ cdef class OBIDMS:
|
||||
|
||||
cdef class OBIDMS_column:
|
||||
|
||||
cdef OBIDMS_column_p pointer
|
||||
cdef OBIDMS dms
|
||||
cdef str data_type
|
||||
cdef str dms_name
|
||||
cdef str column_name
|
||||
cdef index_t nb_elements_per_line
|
||||
cdef list elements_names
|
||||
|
||||
cdef OBIDMS_column_p pointer
|
||||
cdef OBIDMS dms
|
||||
cdef str data_type
|
||||
cdef str dms_name
|
||||
cdef str column_name
|
||||
cdef index_t nb_elements_per_line
|
||||
cdef list elements_names
|
||||
|
||||
cpdef OBIDMS_column_p referred_column_pointer
|
||||
|
||||
# cpdef object get_item(self, index_t line_nb, str element_name) TODO can't declare because not the same in all subclasses
|
||||
# cpdef set_item(self, index_t line_nb, str element_name, object value) TODO can't declare because object value
|
||||
cpdef grep_line(self, index_t line_nb)
|
||||
cpdef list get_elements_names(self)
|
||||
cpdef str get_data_type(self)
|
||||
cpdef index_t get_nb_lines_used(self)
|
||||
|
||||
@ -14,6 +14,7 @@ from .capi.obidmscolumn cimport obi_column_get_header_from_name, \
|
||||
obi_open_column, \
|
||||
obi_close_column, \
|
||||
obi_column_format_date, \
|
||||
obi_grep_line, \
|
||||
OBIDMS_column_header_p
|
||||
from .capi.obitypes cimport const_char_p, \
|
||||
OBIType_t, \
|
||||
@ -109,7 +110,7 @@ cdef class OBIDMS :
|
||||
column_name_b = str2bytes(column_name)
|
||||
dms[column_name] = {}
|
||||
header = obi_column_get_header_from_name(self.pointer, column_name_b, -1)
|
||||
data_type = bytes2str(name_data_type(header.data_type))
|
||||
data_type = bytes2str(name_data_type(header.returned_data_type))
|
||||
line_count = header.line_count
|
||||
creation_date = bytes2str(obi_column_format_date(header.creation_date))
|
||||
obi_unmap_header(header)
|
||||
@ -127,6 +128,7 @@ cdef class OBIDMS :
|
||||
str column_name,
|
||||
bint create=False,
|
||||
bint clone=False, bint clone_data=True,
|
||||
bint referring=False,
|
||||
obiversion_t version_number=-1,
|
||||
str type='',
|
||||
index_t nb_lines=0,
|
||||
@ -157,7 +159,7 @@ cdef class OBIDMS :
|
||||
if create :
|
||||
raise Exception("A data type must be specified")
|
||||
else :
|
||||
data_type = header.data_type
|
||||
data_type = header.returned_data_type
|
||||
else :
|
||||
if type == 'OBI_INT' :
|
||||
data_type = OBI_INT
|
||||
@ -179,7 +181,7 @@ cdef class OBIDMS :
|
||||
if create : # Set to one if not provided (default value)
|
||||
nb_elements_per_line = 1
|
||||
else :
|
||||
nb_elements_per_line = header.nb_elements_per_line
|
||||
nb_elements_per_line = header.returned_nb_elements_per_line
|
||||
if nb_elements_per_line > 1 :
|
||||
elements_names = bytes2str(header.elements_names).split(';')
|
||||
|
||||
@ -258,7 +260,8 @@ cdef class OBIDMS :
|
||||
raise Exception("Problem with the data type")
|
||||
|
||||
column = subclass(self, column_name,
|
||||
create, clone, clone_data,
|
||||
create, clone, clone_data,
|
||||
referring,
|
||||
version_number, data_type,
|
||||
nb_lines, nb_elements_per_line,
|
||||
elements_names, array_name,
|
||||
@ -276,6 +279,7 @@ cdef class OBIDMS_column :
|
||||
str column_name,
|
||||
bint create,
|
||||
bint clone, bint clone_data,
|
||||
bint referring,
|
||||
obiversion_t version_number,
|
||||
OBIType_t type,
|
||||
index_t nb_lines,
|
||||
@ -312,10 +316,14 @@ cdef class OBIDMS_column :
|
||||
elements_names_b = str2bytes(";".join(elements_names))
|
||||
self.pointer = obi_create_column(self.dms.pointer, column_name_b, type,
|
||||
nb_lines, nb_elements_per_line,
|
||||
elements_names_b, array_name_b, comments_b)
|
||||
elements_names_b, array_name_b, comments_b,
|
||||
referring)
|
||||
else :
|
||||
if clone :
|
||||
self.pointer = obi_clone_column(self.dms.pointer, column_name_b, version_number, clone_data)
|
||||
self.pointer = obi_clone_column(self.dms.pointer, column_name_b, version_number, referring, clone_data)
|
||||
elif referring :
|
||||
self.pointer = obi_clone_column(self.dms.pointer, column_name_b, version_number, referring, False)
|
||||
referred_column_pointer = self.pointer.referred_column
|
||||
else :
|
||||
self.pointer = obi_open_column(self.dms.pointer, column_name_b, version_number)
|
||||
|
||||
@ -355,6 +363,9 @@ cdef class OBIDMS_column :
|
||||
# cpdef set_item(self, index_t line_nb, str element_name, object value): TODO
|
||||
# raise NotImplementedError
|
||||
|
||||
cpdef grep_line(self, index_t line_nb):
|
||||
if obi_grep_line(self.pointer, line_nb) < 0 :
|
||||
raise Exception("Error grepping line")
|
||||
|
||||
cpdef list get_elements_names(self):
|
||||
return self.elements_names
|
||||
|
||||
@ -19,12 +19,16 @@ cdef extern from "obidmscolumn.h" nogil:
|
||||
size_t data_size
|
||||
index_t line_count
|
||||
index_t lines_used
|
||||
index_t nb_elements_per_line
|
||||
index_t returned_nb_elements_per_line
|
||||
index_t stored_nb_elements_per_line
|
||||
const_char_p elements_names
|
||||
OBIType_t data_type
|
||||
OBIType_t returned_data_type
|
||||
OBIType_t stored_data_type
|
||||
time_t creation_date
|
||||
obiversion_t version
|
||||
obiversion_t cloned_from
|
||||
bint referring
|
||||
obiversion_t referred_column_version
|
||||
const_char_p name
|
||||
const_char_p array_name
|
||||
const_char_p comments
|
||||
@ -33,6 +37,7 @@ cdef extern from "obidmscolumn.h" nogil:
|
||||
|
||||
struct OBIDMS_column_t:
|
||||
OBIDMS_column_header_p header
|
||||
OBIDMS_column_t* referred_column
|
||||
|
||||
ctypedef OBIDMS_column_t* OBIDMS_column_p
|
||||
|
||||
@ -43,7 +48,8 @@ cdef extern from "obidmscolumn.h" nogil:
|
||||
index_t nb_elements_per_line,
|
||||
const_char_p elements_names,
|
||||
const_char_p array_name,
|
||||
const_char_p comments)
|
||||
const_char_p comments,
|
||||
bint referring)
|
||||
|
||||
OBIDMS_column_p obi_open_column(OBIDMS_p dms,
|
||||
const_char_p column_name,
|
||||
@ -54,6 +60,7 @@ cdef extern from "obidmscolumn.h" nogil:
|
||||
OBIDMS_column_p obi_clone_column(OBIDMS_p dms,
|
||||
const_char_p column_name,
|
||||
obiversion_t version_number,
|
||||
bint referring,
|
||||
bint clone_data)
|
||||
|
||||
int obi_truncate_and_close_column(OBIDMS_column_p column)
|
||||
@ -69,6 +76,8 @@ cdef extern from "obidmscolumn.h" nogil:
|
||||
|
||||
char* obi_column_format_date(time_t date)
|
||||
|
||||
int obi_grep_line(OBIDMS_column_p referring_column, index_t line_to_grep)
|
||||
|
||||
|
||||
cdef extern from "obidmscolumn_int.h" nogil:
|
||||
int obi_column_set_obiint_with_elt_name(OBIDMS_column_p column,
|
||||
|
||||
@ -23,7 +23,8 @@ cdef extern from "obitypes.h" nogil:
|
||||
OBI_BOOL,
|
||||
OBI_CHAR,
|
||||
OBI_STR,
|
||||
OBI_SEQ
|
||||
OBI_SEQ,
|
||||
OBI_IDX
|
||||
|
||||
|
||||
ctypedef OBIType OBIType_t
|
||||
|
||||
Reference in New Issue
Block a user