Fixed two little potential bugs when cleaning unfinished columns and

deleted old trace
This commit is contained in:
Celine Mercier
2017-11-24 18:03:59 +01:00
parent 31726407a3
commit 0998268955

View File

@ -957,11 +957,6 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
return NULL; return NULL;
} }
if (strcmp(column_name, "merged") == 0)
{
fprintf(stderr, "\nversion nb = %d\n", version_number);
}
// Build the indexer name if needed // Build the indexer name if needed
if ((data_type == OBI_STR) || (data_type == OBI_SEQ) || (data_type == OBI_QUAL) || tuples) if ((data_type == OBI_STR) || (data_type == OBI_SEQ) || (data_type == OBI_QUAL) || tuples)
{ {
@ -2017,6 +2012,7 @@ int obi_clean_unfinished_columns(OBIDMS_p dms)
// Find column directories // Find column directories
ddir = 0; ddir = 0;
rewinddir(dms->directory);
while ((dms_dirent = readdir(dms->directory)) != NULL) while ((dms_dirent = readdir(dms->directory)) != NULL)
{ {
if ((dms_dirent->d_name)[0] == '.') if ((dms_dirent->d_name)[0] == '.')
@ -2062,6 +2058,7 @@ int obi_clean_unfinished_columns(OBIDMS_p dms)
i++; i++;
if ((col_dirent->d_name)[i] == '@') // Found a column file if ((col_dirent->d_name)[i] == '@') // Found a column file
{ {
i++;
j=i; j=i;
while ((col_dirent->d_name)[j] != '.') while ((col_dirent->d_name)[j] != '.')
j++; j++;