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

Added the possibility to clone a column, with or without its data

Browse Source
This commit is contained in:
Celine Mercier
2015-08-26 10:29:07 +02:00
parent e6d96d999a
commit 9ad31fddff
4 changed files with 110 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd
View File

@ -35,7 +35,8 @@ cdef extern from "obidmscolumn.h" nogil:
OBIType_t obi_column_get_type(OBIDMS_column_p column)
int obi_close_column(OBIDMS_column_p column)
OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_name)
OBIDMS_column_p obi_clone_column(OBIDMS_p dms, const char* column_name, obiversion_t version_number, bint clone_data)
cdef class OBIDMS_column:
cdef OBIDMS_column_p pointer

66
python/obitools3/obidms/obidmscolumn/capidmscolumn.pyx
View File

@ -12,9 +12,10 @@ cdef class OBIDMS_column:
#Should only be initialized through a subclass (or open())
def __init__(self, dms_name, column_name,
create, version_number,
type, nb_elements,
nb_elements_per_line, elements_names):
create, clone, clone_data,
version_number, type,
nb_elements, nb_elements_per_line,
elements_names):
column_name_b = column_name.encode(encoding='UTF-8')
dms_name_b = dms_name.encode(encoding='UTF-8')
self.dms_name = dms_name
@ -31,13 +32,10 @@ cdef class OBIDMS_column:
else :
dms = obi_open_dms(dms_name_b)
self.dms = dms
self.pointer = obi_open_column(self.dms, column_name_b, version_number)
def create(self, dms_name, column_name, type, nb_elements, nb_elements_per_line=1, elements_names=None):
if elements_names == None :
elements_names = column_name
self.dms = obi_dms(dms_name)
self.pointer = obi_create_column(self.dms, column_name, type, nb_elements, nb_elements_per_line, elements_names)
if clone :
self.pointer = obi_clone_column(self.dms, column_name_b, version_number, clone_data)
else :
self.pointer = obi_open_column(self.dms, column_name_b, version_number)
def __iter__(self):
elements_names = self.get_elements_names()
@ -78,9 +76,10 @@ cdef class OBIDMS_column:
@staticmethod
def open(dms_name, column_name,
create=False, version_number=-1,
type=None, nb_elements=None,
nb_elements_per_line=1, elements_names=None):
create=False, clone=False, clone_data=True,
version_number=-1, type=None,
nb_elements=None, nb_elements_per_line=1,
elements_names=None):
column_name_b = column_name.encode(encoding='UTF-8')
dms_name_b = dms_name.encode(encoding='UTF-8')
@ -94,39 +93,44 @@ cdef class OBIDMS_column:
if type == 1 :
column = OBIDMS_column_int(dms_name, column_name,
create, version_number,
type, nb_elements,
nb_elements_per_line, elements_names)
create, clone, clone_data,
version_number, type,
nb_elements, nb_elements_per_line,
elements_names)
elif type == 2 :
column = OBIDMS_column_float(dms_name, column_name,
create, version_number,
type, nb_elements,
nb_elements_per_line, elements_names)
create, clone, clone_data,
version_number, type,
nb_elements, nb_elements_per_line,
elements_names)
elif type == 3 :
column = OBIDMS_column_bool(dms_name, column_name,
create, version_number,
type, nb_elements,
nb_elements_per_line, elements_names)
create, clone, clone_data,
version_number, type,
nb_elements, nb_elements_per_line,
elements_names)
# elif type == 4 :
# column = OBIDMS_column_char(dms_name, column_name,
# create, version_number,
# type, nb_elements,
# nb_elements_per_line, elements_names)
# elif type == 4 :
# column = OBIDMS_column_char(dms_name, column_name,
# create, clone, clone_data,
# version_number, type,
# nb_elements, nb_elements_per_line,
# elements_names)
elif type == 5 :
column = OBIDMS_column_idx(dms_name, column_name,
create, version_number,
type, nb_elements,
nb_elements_per_line, elements_names)
create, clone, clone_data,
version_number, type,
nb_elements, nb_elements_per_line,
elements_names)
else :
"Problem with the data type"
return column