Skip to content
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

Minor but urgent fixes #206

Merged
merged 4 commits into from
May 11, 2022
Merged

Minor but urgent fixes #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b04e7a
framework/CMakeLists.txt fixing compilation issue
jgalan May 11, 2022
63d551c
restRoot. Now it will prevent the user if the file does not exist
jgalan May 11, 2022
164432d
TRestMetadata::GetSearchPath. Adding examples directory to the search…
jgalan May 9, 2022
cfbcbe8
TRestRun::ReadFileInfo. Fixing a bug when the data member format must…
jgalan May 10, 2022
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
2 changes: 2 additions & 0 deletions source/bin/restRoot.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ int main(int argc, char* argv[]) {

argv[i] = (char*)"";
Nfile++;
} else if (TRestTools::isRootFile(opt)) {
printf("\nFile %s not found ... !!\n", opt.c_str());
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_library(CURL_LIB curl)
if (NOT ${CURL_LIB} STREQUAL "CURL_LIB-NOTFOUND")
add_compile_definitions(USE_Curl)
message(STATUS "Found curl library: ${CURL_LIB}")
set(external_libs "${external_libs};-lcurl;stdc++fs")
set(external_libs "${external_libs};-lcurl;-lstdc++fs")
endif ()

COMPILEDIR(RestFramework)
Expand Down
3 changes: 2 additions & 1 deletion source/framework/core/src/TRestMetadata.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2218,7 +2218,8 @@ TString TRestMetadata::GetSearchPath() {

if (getenv("configPath")) result += getenv("configPath") + (string) ":";
result += REST_PATH + "/data/:";
// We give priority to the official /data/ path.
result += REST_PATH + "/examples/:";
// We give priority to the official /data/ and /examples/ path.
result += REST_USER_PATH + ":";
if (result.back() == ':') result.erase(result.size() - 1);

Expand Down
1 change: 1 addition & 0 deletions source/framework/core/src/TRestRun.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ void TRestRun::ReadFileInfo(const string& filename) {
int pos1 = name.find(formatprefixlist[i], pos + 1) + formatprefixlist[i].size();
if (formatprefixlist[i] == "") pos1 = 0;
int pos2 = name.find(formatprefixlist[i + 1], pos1);
if (formatprefixlist[i + 1] == "") pos2 = name.length();
if (pos1 == -1 || pos2 == -1) {
warning << "File pattern matching: file format mismatch!" << endl;
return;
Expand Down