diff --git a/appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java b/appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java index d115b890329278cde645267165e1a554c2c7bf7c..67d19964c145c2fc3dc103ca7a131b78a7cfdc09 100644 --- a/appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java +++ b/appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java @@ -106,7 +106,7 @@ public class LihControlParser extends SubjectParser { if (zipCode.startsWith("L")) { return "Luxembourg"; } else if (zipCode.startsWith("D")){ - return "Germany"; + return "Deutschland"; } else if (zipCode.startsWith("F")){ return "France"; } else if (zipCode.startsWith("B")){ diff --git a/appointment-import/src/main/java/smash/appointment/parse/Main.java b/appointment-import/src/main/java/smash/appointment/parse/Main.java index be0d279eff630bb81ff4dd9971325fcee2a49587..7ade6f3b0a90d79e9c0049e3c4fcf36160ee04ac 100644 --- a/appointment-import/src/main/java/smash/appointment/parse/Main.java +++ b/appointment-import/src/main/java/smash/appointment/parse/Main.java @@ -111,38 +111,45 @@ public class Main { } private void removeDuplicates(String duplicatesFile) throws IOException { + logger.info("PROCESSING FILE: " + duplicatesFile); DuplicateRemoveParser parser = new DuplicateRemoveParser(); parser.setSubjectDao(subjectDao); parser.removeDuplicates(duplicatesFile); } private List<AppointmentEntry> processRedCapAppointments(String agendaFile) throws Exception { + logger.info("PROCESSING FILE: " + agendaFile); RedcapParser parser = new RedcapParser(); parser.setSubjectDao(subjectDao); return parser.parse(agendaFile); } private List<Subject> processLihMappingControls(String lihMappingControlsFile) throws Exception { + logger.info("PROCESSING FILE: " + lihMappingControlsFile); LihControlMappingParser parser = new LihControlMappingParser(); return parser.processExcel(lihMappingControlsFile); } private List<Subject> processLihControls(String lihControlsFile) throws Exception { + logger.info("PROCESSING FILE: " + lihControlsFile); LihControlParser parser = new LihControlParser(); return parser.processExcel(lihControlsFile); } private List<Subject> processFlyingTeamControls(String flyingTeamFile) throws Exception { + logger.info("PROCESSING FILE: " + flyingTeamFile); PrcFlyingParser parser = new PrcFlyingParser(); return parser.processExcel(flyingTeamFile); } private List<Subject> processPrcControls(String controlsFile) throws Exception { + logger.info("PROCESSING FILE: " + controlsFile); PrcControlParser parser = new PrcControlParser(); return parser.processExcel(controlsFile); } private List<AppointmentEntry> processPrcAppointments(String agendaFile, Calendar minDate) throws Exception { + logger.info("PROCESSING FILE: " + agendaFile); XlsxCalendarProcessor processor = new XlsxCalendarProcessor(); processor.setSubjectDao(subjectDao); List<AppointmentEntry> entries = processor.processExcel(agendaFile, minDate); @@ -155,6 +162,7 @@ public class Main { } private List<Subject> processPrcSubjects(String subjectsFile) throws Exception { + logger.info("PROCESSING FILE: " + subjectsFile); PrcSubjectsParser parser = new PrcSubjectsParser(); return parser.processExcel(subjectsFile); }