From 03ab7b50aac43b6e5ef1da0f05d827c132fa321e Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 2 Mar 2017 11:31:43 +0100
Subject: [PATCH] getting by nd number improved (when nd number is invalid it
 returns null)

---
 .../src/main/java/smash/appointment/parse/SubjectDao.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appointment-import/src/main/java/smash/appointment/parse/SubjectDao.java b/appointment-import/src/main/java/smash/appointment/parse/SubjectDao.java
index 38dada10..efe0000b 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/SubjectDao.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/SubjectDao.java
@@ -13,7 +13,7 @@ public class SubjectDao {
 	private List<Subject>	subjects = new ArrayList<>();
 
 	public void addSubject(Subject subject, String errorPrefix) {
-		if (subject.getNdNumber() != null && !subject.getNdNumber().trim().isEmpty()) {
+		if (subject.getNdNumber() != null && !Utils.simplifyString(subject.getNdNumber()).isEmpty()) {
 			Subject existing = getByNdNumber(subject.getNdNumber());
 			if (existing != null) {
 				if (!existing.getScreeningNumber().equals(subject.getScreeningNumber())) {
-- 
GitLab