Skip to content
Snippets Groups Projects
Commit 7eee556d authored by Piotr Gawron's avatar Piotr Gawron
Browse files

country name unified

parent e9129a6b
No related branches found
No related tags found
1 merge request!12Duplicates removal
......@@ -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")){
......
......@@ -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);
}
......
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