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

Added the possibility to clone a column, with or without its data

Browse Source
This commit is contained in:
Celine Mercier
2015-08-26 10:29:07 +02:00
parent e6d96d999a
commit 9ad31fddff
4 changed files with 110 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/obidmscolumn.c
View File

@ -723,6 +723,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
header->data_type = type;
header->creation_date = time(NULL);
header->version = version_number;
header->cloned_from = -1;
header->comments[0] = 0x0;
obi_column_set_elements_names(new_column, elements_names);
@ -813,7 +814,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
column->header = mmap(NULL,
header_size,
PROT_READ,
MAP_SHARED,
MAP_PRIVATE,
column_file_descriptor,
0
);
@ -836,7 +837,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
column->data = mmap(NULL,
data_size,
PROT_READ,
MAP_SHARED,
MAP_PRIVATE,
column_file_descriptor,
header_size
);
@ -861,9 +862,59 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
}
OBIDMS_column_p obi_clone_column(OBIDMS_p dms, const char* column_name, obiversion_t version_number, bool clone_data)
{
OBIDMS_column_p column_to_clone;
OBIDMS_column_p new_column;
size_t nb_lines;
size_t nb_elements_per_line;
OBIType_t data_type;
column_to_clone = obi_open_column(dms, column_name, version_number);
if (column_to_clone == NULL)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError opening the column to clone");
return NULL;
}
if (clone_data)
nb_lines = (column_to_clone->header)->line_count;
else
nb_lines = INITIAL_LINE_COUNT;
nb_elements_per_line = (column_to_clone->header)->nb_elements_per_line;
data_type = (column_to_clone->header)->data_type;
new_column = obi_create_column(dms,
column_name,
data_type,
nb_lines,
nb_elements_per_line,
(column_to_clone->header)->elements_names);
if (new_column == NULL)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError creating the new column when cloning a column");
// TODO the new file should be deleted
return NULL;
}
(new_column->header)->cloned_from = version_number;
// TODO copy header->comments?
if (clone_data)
memcpy(new_column->data, column_to_clone->data, nb_lines*nb_elements_per_line*sizeof(data_type));
return new_column;
}
int obi_close_column(OBIDMS_column_p column)
{
//munmap? TODO
//truncate to lines used TODO
free(column);
return 0;
}