diff --git a/python/obitools3/obidms/_obidms.pxd b/python/obitools3/obidms/_obidms.pxd index 1e791a2..ed440d2 100644 --- a/python/obitools3/obidms/_obidms.pxd +++ b/python/obitools3/obidms/_obidms.pxd @@ -9,8 +9,8 @@ from ._obitaxo cimport OBI_Taxonomy cdef class OBIDMS_column: - cdef str column_name cdef str column_alias # associated property: alias + cdef str original_name # associated_property: original_name cdef OBIDMS_column_p* pointer cdef OBIDMS dms cdef OBIView view diff --git a/python/obitools3/obidms/_obidms.pyx b/python/obitools3/obidms/_obidms.pyx index bd497d3..314edea 100644 --- a/python/obitools3/obidms/_obidms.pyx +++ b/python/obitools3/obidms/_obidms.pyx @@ -97,7 +97,7 @@ cdef class OBIDMS_column : self.dms = view.dms self.view = view self.data_type = bytes2str(name_data_type((column_p.header).returned_data_type)) - self.column_name = bytes2str((column_p.header).name) + self.original_name = bytes2str((column_p.header).name) 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(';') @@ -136,7 +136,7 @@ cdef class OBIDMS_column : cpdef dict get_references(self): # Make properties refs = {} - refs['name'] = self.column_name + refs['name'] = self.original_name refs['version'] = (self.pointer)[0].header.version return refs @@ -148,7 +148,7 @@ cdef class OBIDMS_column : return to_print def __repr__(self) : - return (self.column_name + ", version " + str((self.pointer)[0].header.version) + ", data type: " + self.data_type) + return (self.column_alias + ", original name: " + self.original_name + ", version " + str((self.pointer)[0].header.version) + ", data type: " + self.data_type) cpdef close(self): if obi_close_column((self.pointer)[0]) < 0 : @@ -177,6 +177,11 @@ cdef class OBIDMS_column : def data_type(self): return self.data_type + # original_name property getter + @property + def original_name(self): + return self.original_name + @staticmethod cdef object get_subclass_type(OBIDMS_column_p column_p) :