From 0951934f77bb66f631a2bc98894eeba46ac6b7d5 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Fri, 25 Sep 2015 11:28:23 +0200 Subject: [PATCH] test --- .../obidms/{capidms.cfiles => _obidms.cfiles} | 0 .../obidms/{capidms.pxd => _obidms.pxd} | 19 ++-------- .../obidms/{capidms.pyx => _obidms.pyx} | 1 + .../obidms/obidmscolumn/_obidmscolumn.pxd | 20 +++++++++++ .../obidms/obidmscolumn/capidmscolumn.pxd | 36 ------------------- 5 files changed, 24 insertions(+), 52 deletions(-) rename python/obitools3/obidms/{capidms.cfiles => _obidms.cfiles} (100%) rename python/obitools3/obidms/{capidms.pxd => _obidms.pxd} (59%) rename python/obitools3/obidms/{capidms.pyx => _obidms.pyx} (99%) create mode 100644 python/obitools3/obidms/obidmscolumn/_obidmscolumn.pxd delete mode 100644 python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd diff --git a/python/obitools3/obidms/capidms.cfiles b/python/obitools3/obidms/_obidms.cfiles similarity index 100% rename from python/obitools3/obidms/capidms.cfiles rename to python/obitools3/obidms/_obidms.cfiles diff --git a/python/obitools3/obidms/capidms.pxd b/python/obitools3/obidms/_obidms.pxd similarity index 59% rename from python/obitools3/obidms/capidms.pxd rename to python/obitools3/obidms/_obidms.pxd index 217fb31..e88888a 100644 --- a/python/obitools3/obidms/capidms.pxd +++ b/python/obitools3/obidms/_obidms.pxd @@ -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: diff --git a/python/obitools3/obidms/capidms.pyx b/python/obitools3/obidms/_obidms.pyx similarity index 99% rename from python/obitools3/obidms/capidms.pyx rename to python/obitools3/obidms/_obidms.pyx index 9c9c26b..6223d25 100644 --- a/python/obitools3/obidms/capidms.pyx +++ b/python/obitools3/obidms/_obidms.pyx @@ -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 diff --git a/python/obitools3/obidms/obidmscolumn/_obidmscolumn.pxd b/python/obitools3/obidms/obidmscolumn/_obidmscolumn.pxd new file mode 100644 index 0000000..d6cc90e --- /dev/null +++ b/python/obitools3/obidms/obidmscolumn/_obidmscolumn.pxd @@ -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) diff --git a/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd b/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd deleted file mode 100644 index d42634b..0000000 --- a/python/obitools3/obidms/obidmscolumn/capidmscolumn.pxd +++ /dev/null @@ -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