From 2b3d6e67052d40bb7ba2697cc5bb3d1ade29748a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 1 Mar 2017 10:11:25 +0100
Subject: [PATCH] language parsing inmproved
---
.../main/java/smash/appointment/parse/LihControlParser.java | 4 +++-
.../src/main/java/smash/appointment/parse/Subject.java | 1 +
appointment-import/src/main/resources/log4j.properties | 2 +-
.../java/smash/appointment/parse/LihControlParserTest.java | 4 ++++
4 files changed, 9 insertions(+), 2 deletions(-)
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 eb16daa5..fe44bb6f 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java
@@ -165,7 +165,7 @@ public class LihControlParser extends SubjectParser {
return result;
}
- private String getMappedLanguage(String abbreviation) {
+ protected String getMappedLanguage(String abbreviation) {
switch (abbreviation.toUpperCase()) {
case ("F"):
return "French";
@@ -179,6 +179,8 @@ public class LihControlParser extends SubjectParser {
return "Portuguese";
case ("ENG"):
return "English";
+ case ("EN"):
+ return "English";
case ("FR"):
return "French";
case ("L"):
diff --git a/appointment-import/src/main/java/smash/appointment/parse/Subject.java b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
index e41fd63d..7843080d 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/Subject.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
@@ -480,6 +480,7 @@ public class Subject {
if (subject.getToBeSeenAt().equals("F")) {
setToBeSeenAt(subject.getToBeSeenAt());
}
+ addLanguages(subject.getLanguages());
}
private SubjectType getMergedValue(String string, SubjectType existingValue, SubjectType newValue, String errorPrefix) {
diff --git a/appointment-import/src/main/resources/log4j.properties b/appointment-import/src/main/resources/log4j.properties
index e108a78c..c3a78a92 100644
--- a/appointment-import/src/main/resources/log4j.properties
+++ b/appointment-import/src/main/resources/log4j.properties
@@ -1,5 +1,5 @@
#Set root logger 's level and its appender to an appender called CONSOLE which is defined below.
-log4j.rootLogger=debug, CONSOLE
+log4j.rootLogger=fatal, CONSOLE
#Set the behavior of the CONSOLE appender
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
diff --git a/appointment-import/src/test/java/smash/appointment/parse/LihControlParserTest.java b/appointment-import/src/test/java/smash/appointment/parse/LihControlParserTest.java
index 589da171..bce5ee61 100644
--- a/appointment-import/src/test/java/smash/appointment/parse/LihControlParserTest.java
+++ b/appointment-import/src/test/java/smash/appointment/parse/LihControlParserTest.java
@@ -29,6 +29,10 @@ public class LihControlParserTest extends TestBase {
public void tearDown() throws Exception {
}
+ @Test
+ public void testParseLang() throws Exception {
+ assertEquals("English",processor.getMappedLanguage("EN"));
+ }
@Test
public void test() throws Exception {
List<Subject> entries = processor.processExcel("testFiles/lihControlExample.xlsx");
--
GitLab