This commit is contained in:
Celine Mercier
2015-09-25 11:28:23 +02:00
parent 68b6ab3224
commit 0951934f77
5 changed files with 24 additions and 52 deletions

View File

@ -1,20 +1,7 @@
from obitools3.obidms.obidmscolumn.capidmscolumn cimport OBIDMS_column
from obitools3.obidms.capitypes cimport OBIType_t, obiversion_t
from .capi.obidms cimport OBIDMS_p
from .capi.obitypes cimport obiversion_t, OBIType_t
cdef extern from *:
ctypedef char* const_char_p "const char*"
cdef extern from "obierrno.h" nogil:
extern int obi_errno
cdef extern from "obidms.h" nogil:
struct OBIDMS_t:
pass
ctypedef OBIDMS_t* OBIDMS_p
OBIDMS_p obi_dms(const_char_p dms_name)
int obi_close_dms(OBIDMS_p dms)
cdef class OBIDMS_column
cdef class OBIDMS:

View File

@ -1,6 +1,7 @@
#cython: language_level=3
from obitools3.utils cimport bytes2str, str2bytes
from obitools3.obidms.obidmscolumn._obidmscolumn cimport OBIDMS_column
from pathlib import Path
# from obitools3.obidms.obidmscolumn.capidmscolumn cimport OBIDMS_column

View File

@ -0,0 +1,20 @@
from obitools3.obidms.capi.obidms cimport OBIDMS_p
from obitools3.obidms.capi.obierrno cimport obi_errno
from obitools3.obidms.capi.obidmscolumn cimport OBIDMS_column_p
cdef class OBIDMS
cdef class OBIDMS_column:
cdef OBIDMS_column_p pointer
cdef OBIDMS dms
cdef str data_type # TODO keep as OBIType_t? both?
cdef str dms_name
cdef str column_name
cpdef object get_item(self, size_t line_nb, str element_name)
cpdef list get_elements_names(self)
cpdef str get_data_type(self)
cpdef size_t get_nb_lines_used(self)

View File

@ -1,36 +0,0 @@
from obitools3.obidms.capidms cimport OBIDMS_p
from obitools3.obidms.capidms cimport obi_errno
from obitools3.obidms.capidms cimport OBIDMS
cdef extern from "obidmscolumn.h" nogil:
struct OBIDMS_column_t:
pass
ctypedef OBIDMS_column_t* OBIDMS_column_p
OBIDMS_column_p obi_create_column(OBIDMS_p dms, const char* column_name, OBIType_t type, size_t nb_lines, size_t nb_elements_per_line, const char* elements_names)
size_t obi_column_get_nb_lines_used(OBIDMS_column_p column)
const char* obi_column_get_elements_names(OBIDMS_column_p column)
void obi_column_make_unwritable(OBIDMS_column_p column)
OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversion_t version_number)
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)
int obi_truncate_and_close_column(OBIDMS_column_p column)
obiversion_t obi_column_get_latest_version_from_name(OBIDMS_p dms, const char* column_name)
OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_name)
size_t obi_column_get_line_count_from_name(OBIDMS_p dms, const char* column_name)
cdef class OBIDMS_column:
cpdef object get_item(self, line_nb, element_name)
cpdef get_elements_names(OBIDMS_column column)
cpdef get_data_type(OBIDMS_column column)
cpdef get_nb_lines_used(OBIDMS_column column)
cdef OBIDMS_column_p pointer
cdef OBIDMS dms
cdef str data_type # TODO keep as OBIType_t? both?
cdef str dms_name
cdef str column_name