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

Views are now rollbacked if an error occurs, and unfinished views and

Browse Source 
columns are deleted when an OBIDMS is opened.
This commit is contained in:
Celine Mercier
2017-10-26 18:58:48 +02:00
parent 1ae634d56b
commit dfd51939a0
11 changed files with 702 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/obidmscolumndir.c
View File

@@ -28,39 +28,15 @@
#define DEBUG_LEVEL 0 // TODO has to be defined somewhere else (cython compil flag?)
/**************************************************************************
/**********************************************************************
*
* D E C L A R A T I O N O F T H E P R I V A T E F U N C T I O N S
* D E F I N I T I O N O F T H E P U B L I C F U N C T I O N S
*
**************************************************************************/
**********************************************************************/
/**
* Internal function building the column directory name from an OBIDMS column name.
*
* The function builds the directory name corresponding to an OBIDMS column directory.
* It checks also that the name is not too long.
*
* @warning The returned pointer has to be freed by the caller.
*
* @param column_name The name of the OBIDMS column.
*
* @returns A pointer to the OBIDMS column directory name.
* @retval NULL if an error occurred.
*
* @since June 2015
* @author Celine Mercier (celine.mercier@metabarcoding.org)
*/
static char* build_column_directory_name(const char* column_name);
/************************************************************************
*
* D E F I N I T I O N O F T H E P R I V A T E F U N C T I O N S
*
************************************************************************/
static char* build_column_directory_name(const char* column_name)
char* obi_build_column_directory_name(const char* column_name)
{
char* column_directory_name;
@@ -86,12 +62,6 @@ static char* build_column_directory_name(const char* column_name)
}
/**********************************************************************
*
* D E F I N I T I O N O F T H E P U B L I C F U N C T I O N S
*
**********************************************************************/
int obi_column_directory_exists(OBIDMS_p dms, const char* column_name)
{
struct stat buffer;
@@ -100,7 +70,7 @@ int obi_column_directory_exists(OBIDMS_p dms, const char* column_name)
int check_dir;
// Build and check the directory name
column_directory_name = build_column_directory_name(column_name);
column_directory_name = obi_build_column_directory_name(column_name);
if (column_directory_name == NULL)
return -1;
@@ -131,7 +101,7 @@ OBIDMS_column_directory_p obi_create_column_directory(OBIDMS_p dms, const char*
char* column_directory_name;
// Build and check the directory name
column_directory_name = build_column_directory_name(column_name);
column_directory_name = obi_build_column_directory_name(column_name);
if (column_directory_name == NULL)
{
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
@@ -165,7 +135,7 @@ OBIDMS_column_directory_p obi_open_column_directory(OBIDMS_p dms, const char* co
column_directory = NULL;
// Build and check the directory name
column_directory_name = build_column_directory_name(column_name);
column_directory_name = obi_build_column_directory_name(column_name);
if (column_directory_name == NULL)
return NULL;