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

Made the truncating of columns automatic when closing them (note:

Browse Source 
already the case for AVLs)
This commit is contained in:
Celine Mercier
2016-04-14 15:13:30 +02:00
parent 9d042f7bd0
commit 4cb52e1632
11 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/obitools3/obidms/_obidms.pyx
View File

@ -5,7 +5,7 @@ from obitools3.utils cimport bytes2str, str2bytes
from .capi.obidms cimport obi_dms, \
obi_close_dms
from .capi.obidmscolumn cimport obi_truncate_and_close_column, \
from .capi.obidmscolumn cimport obi_close_column, \
obi_column_format_date, \
OBIDMS_column_p, \
OBIDMS_column_header_p
@ -144,7 +144,7 @@ cdef class OBIDMS_column :
return to_print
cpdef close(self):
if obi_truncate_and_close_column((self.pointer)[0]) < 0 :
if obi_close_column((self.pointer)[0]) < 0 :
raise Exception("Problem closing a column")

1
python/obitools3/obidms/_obidmscolumn_bool.pyx
View File

@ -1,6 +1,5 @@
#cython: language_level=3
from .capi.obidmscolumn cimport obi_truncate_and_close_column
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, \

1
python/obitools3/obidms/_obidmscolumn_char.pyx
View File

@ -1,6 +1,5 @@
#cython: language_level=3
from .capi.obidmscolumn cimport obi_truncate_and_close_column
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, \

1
python/obitools3/obidms/_obidmscolumn_float.pyx
View File

@ -1,6 +1,5 @@
#cython: language_level=3
from .capi.obidmscolumn cimport obi_truncate_and_close_column
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, \

1
python/obitools3/obidms/_obidmscolumn_int.pyx
View File

@ -1,6 +1,5 @@
#cython: language_level=3
from .capi.obidmscolumn cimport obi_truncate_and_close_column
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, \

1
python/obitools3/obidms/_obidmscolumn_seq.pyx
View File

@ -1,6 +1,5 @@
#cython: language_level=3
from .capi.obidmscolumn cimport obi_truncate_and_close_column
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, \

1
python/obitools3/obidms/_obidmscolumn_str.pyx
View File

@ -1,6 +1,5 @@
#cython: language_level=3
from .capi.obidmscolumn cimport obi_truncate_and_close_column
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, \

2
python/obitools3/obidms/capi/obidmscolumn.pxd
View File

@ -60,7 +60,7 @@ cdef extern from "obidmscolumn.h" nogil:
obiversion_t version_number,
bint clone_data)
int obi_truncate_and_close_column(OBIDMS_column_p column)
int obi_close_column(OBIDMS_column_p column)
obiversion_t obi_column_get_latest_version_from_name(OBIDMS_p dms,
const_char_p column_name)