From 7eee556db184902aa3d47e38d997ae1a2aea2609 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 16 Mar 2017 11:01:18 +0100
Subject: [PATCH] country name unified
---
.../java/smash/appointment/parse/LihControlParser.java | 2 +-
.../src/main/java/smash/appointment/parse/Main.java | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
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 d115b890..67d19964 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 be0d279e..7ade6f3b 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);
}
--
GitLab