From bd50b3f9725fb1aa1df0df91d7fc79fff69c2cf9 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Mon, 26 Sep 2016 17:45:10 +0200 Subject: [PATCH] Added version property to OBIDMS_column class --- python/obitools3/obidms/_obidms.pxd | 9 ++++++--- python/obitools3/obidms/_obidms.pyx | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/python/obitools3/obidms/_obidms.pxd b/python/obitools3/obidms/_obidms.pxd index ed440d2..aaea737 100644 --- a/python/obitools3/obidms/_obidms.pxd +++ b/python/obitools3/obidms/_obidms.pxd @@ -11,18 +11,21 @@ cdef class OBIDMS_column: cdef str column_alias # associated property: alias cdef str original_name # associated_property: original_name + cdef int version # associated_property: version + cdef str data_type # associated property: data_type + cdef index_t nb_elements_per_line # associated property: nb_elements_per_line + cdef list elements_names # associated property: elements_names + cdef OBIDMS_column_p* pointer cdef OBIDMS dms cdef OBIView view - cdef str data_type # associated property: data_type cdef str dms_name - cdef index_t nb_elements_per_line # associated property: nb_elements_per_line - cdef list elements_names # associated property: elements_names cpdef index_t get_nb_lines_used(self) cpdef str get_creation_date(self) cpdef str get_comments(self) cpdef dict get_references(self) + cpdef close(self) @staticmethod cdef object get_subclass_type(OBIDMS_column_p column_p) diff --git a/python/obitools3/obidms/_obidms.pyx b/python/obitools3/obidms/_obidms.pyx index 314edea..2c8355c 100644 --- a/python/obitools3/obidms/_obidms.pyx +++ b/python/obitools3/obidms/_obidms.pyx @@ -98,6 +98,7 @@ cdef class OBIDMS_column : self.view = view self.data_type = bytes2str(name_data_type((column_p.header).returned_data_type)) self.original_name = bytes2str((column_p.header).name) + self.version = (column_p.header).version self.column_alias = column_alias self.nb_elements_per_line = (column_p.header).nb_elements_per_line self.elements_names = (bytes2str((column_p.header).elements_names)).split(';') @@ -182,6 +183,11 @@ cdef class OBIDMS_column : def original_name(self): return self.original_name + # version property getter + @property + def version(self): + return self.version + @staticmethod cdef object get_subclass_type(OBIDMS_column_p column_p) :