Skip to content

Fix: Bug in PR #2526 #2533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
santorofer merged 1 commit into from
Feb 13, 2023
Merged

Fix: Bug in PR #2526 #2533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions treeshr/TreeGetSetShotId.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ int TreeGetCurrentShotId(char const *experiment)
{
int shot = 0;
int status = TreeFAILURE;
char exp[16] = {0};
char experiment_lower[16] = {0};
size_t slen;
char * pathlist = TreePath(experiment, exp);
char * pathlist = TreePath(experiment, experiment_lower);
char * filename;
char * saveptr = NULL;
char * path = strtok_r(pathlist, TREE_PATH_LIST_DELIM, &saveptr);
Expand All @@ -153,11 +153,11 @@ int TreeGetCurrentShotId(char const *experiment)
if (thick)
{
path[slen - 2] = 0;
status = TreeGetCurrentShotIdRemote(exp, path, &shot);
status = TreeGetCurrentShotIdRemote(experiment_lower, path, &shot);
}
else
{
filename = PathToFileName(experiment, path);
filename = PathToFileName(experiment_lower, path);

if (MDS_IO_EXISTS(filename)) {
status = ReadShotId(filename, &shot);
Expand All @@ -177,9 +177,9 @@ int TreeGetCurrentShotId(char const *experiment)
int TreeSetCurrentShotId(char const *experiment, int shot)
{
int status = TreeFAILURE;
char exp[16] = {0};
char experiment_lower[16] = {0};
size_t slen;
char * pathlist = TreePath(experiment, exp);
char * pathlist = TreePath(experiment, experiment_lower);
char * filename;
char * saveptr = NULL;
char * path = strtok_r(pathlist, TREE_PATH_LIST_DELIM, &saveptr);
Expand All @@ -189,11 +189,11 @@ int TreeSetCurrentShotId(char const *experiment, int shot)
if (thick)
{
path[slen - 2] = 0;
status = TreeSetCurrentShotIdRemote(exp, path, shot);
status = TreeSetCurrentShotIdRemote(experiment_lower, path, shot);
}
else
{
filename = PathToFileName(experiment, path);
filename = PathToFileName(experiment_lower, path);

if (MDS_IO_EXISTS(filename)) {
status = WriteShotId(filename, shot, O_WRONLY);
Expand All @@ -212,7 +212,7 @@ int TreeSetCurrentShotId(char const *experiment, int shot)
// there is one further down the path, recommend only putting thick client at the end
// of tree paths.
if (STATUS_NOT_OK) {
pathlist = TreePath(experiment, exp);
pathlist = TreePath(experiment, experiment_lower);
saveptr = NULL;
path = strtok_r(pathlist, TREE_PATH_LIST_DELIM, &saveptr);
while (path) {
Expand All @@ -221,7 +221,7 @@ int TreeSetCurrentShotId(char const *experiment, int shot)
slen = strlen(path);
bool thick = (slen > 2) && (path[slen - 1] == ':') && (path[slen - 2] == ':');
if (!thick) {
filename = PathToFileName(experiment, path);
filename = PathToFileName(experiment_lower, path);

status = WriteShotId(filename, shot, O_RDWR | O_CREAT | O_TRUNC);
}
Expand Down