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

View rollback: version files and column directories aren't deleted

Browse Source 
anymore to prevent indexer bug, and fixed a freeing bug
This commit is contained in:
Celine Mercier
2017-11-15 17:27:26 +01:00
parent 9a50803c00
commit 3ba7ce1c91
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/obiview.c
View File

@ -2671,7 +2671,7 @@ int obi_rollback_view(Obiview_p view)
ret_value = -1;
}
// Delete column dir if it's empty
// Delete column dir if it's empty TODO doesn't happen because version file
n = count_dir(column_dir_path);
if (n == 0)
{
@ -2687,7 +2687,6 @@ int obi_rollback_view(Obiview_p view)
free(column_dir_path);
}
}
// Delete line selection if there is one
if (view->line_selection != NULL)
{
@ -2726,7 +2725,7 @@ int obi_rollback_view(Obiview_p view)
ret_value = -1;
}
// Delete column dir if it's empty
// Delete column dir if it's empty TODO doesn't happen because version file
n = count_dir(column_dir_path);
if (n == 0)
{
@ -2767,11 +2766,11 @@ int obi_rollback_view(Obiview_p view)
strcat(view_relative_path, view_file_name);
view_full_path = obi_dms_get_full_path(view->dms, view_relative_path);
remove(view_full_path);
free(view_relative_path);
free(view_full_path);
}
}
free(view_file_name);
free(view_relative_path);
free(view_full_path);
}
// Free the linked list of column pointers
@ -2779,7 +2778,6 @@ int obi_rollback_view(Obiview_p view)
// Free the column dictionary
ht_free(view->column_dict);
free(view);
return ret_value;