Skip to content
Snippets Groups Projects
Commit aefc6a6a authored by Erik Diers's avatar Erik Diers
Browse files

Added Day as session prefix and some fixes

parent 4508e043
Branches main
No related tags found
No related merge requests found
No preview for this file type
......@@ -156,7 +156,14 @@ public class StudyChecker {
private void checkSessions(File subjF) {
File[] sessions = subjF.listFiles(f -> f.isDirectory() && f.getName().toLowerCase().startsWith("ses"));
if (sessions.length == 0) {
File[] days = subjF.listFiles(f -> f.isDirectory() && f.getName().toLowerCase().startsWith("day"));
if (days.length > sessions.length) {
sessions = days;
}
}
inconsitentSessionError.checkSubj(subjF, sessions.length);
if (sessions.length == 0) {
......@@ -232,12 +239,18 @@ public class StudyChecker {
SFB_JSON_Util.readInJson(metaJson, (obj) -> {
@SuppressWarnings("unchecked")
String subjID = ((String) (obj.getOrDefault("Subject ID", ""))).trim();
if (!(currentSubjName.equals(subjID) || (currentSubjName).equals(subjPrefix + subjID) || (currentSubjName).equals("sub-" + subjID))) {
if (!(
currentSubjName.equals(subjID) ||
(currentSubjName).equals(subjPrefix + subjID) ||
(subjPrefix + currentSubjName).equals(subjID) ||
(currentSubjName).equals("sub-" + subjID) ||
("sub-" + currentSubjName).equals(subjID)
)) {
incorrectSubjectIDInMetaDataError.add(metaJson, currentSubjName + " != " + subjID);
}
});
//System.out.println("Checked: " + metaJson.getAbsolutePath());
MetaJsonChecker.check(metaJson, metadataError);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment