diff --git a/builds/SFB_StudyChecker.jar b/builds/SFB_StudyChecker.jar index b784c826c0a9238368a1effc70cc1a4f0748c576..c539fce809ebbc11862e9277197ed0a91f79cf83 100644 Binary files a/builds/SFB_StudyChecker.jar and b/builds/SFB_StudyChecker.jar differ diff --git a/src/main/StudyChecker.java b/src/main/StudyChecker.java index 35e4151f76bf60a217844f9e0c6c00807dd710da..ca69188519e4165343b84a557c3a514fc964371b 100644 --- a/src/main/StudyChecker.java +++ b/src/main/StudyChecker.java @@ -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); } }