From 75839812b6e153015fbb82dc16818f5db5b7f2fe Mon Sep 17 00:00:00 2001
From: Lara Blersch <lb210@hdm-stuttgart.de>
Date: Wed, 10 May 2023 12:25:24 +0200
Subject: [PATCH] fixed bug in method getMeasurementFromString
---
src/main/java/mi/hdm/filesystem/CSVParser.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/mi/hdm/filesystem/CSVParser.java b/src/main/java/mi/hdm/filesystem/CSVParser.java
index d755845..e684e98 100644
--- a/src/main/java/mi/hdm/filesystem/CSVParser.java
+++ b/src/main/java/mi/hdm/filesystem/CSVParser.java
@@ -64,7 +64,8 @@ public class CSVParser {
final List<Double> nutrition = new ArrayList<>();
for (int i = 1; i < idx.length; i++) {
- String element = splitLine.get(idx[i]).split(" ")[0];
+ //String element = splitLine.get(idx[i]).split(" ")[0];
+ String element = splitLine.get(idx[i]);
double quantity = parseNumberFromString(element);
if (getMeasurementFromString(element).equals("mg")) {
quantity = quantity /1000;
@@ -143,7 +144,7 @@ public class CSVParser {
StringBuilder unit = new StringBuilder();
for (int i = 0; i < candidate.length(); i++) {
char c = candidate.charAt(i);
- if (!Character.isDigit(c) && !(c == ' ')) {
+ if (!Character.isDigit(c) && !(c == ' ') && !(c == '.')) {
unit.append(c);
}
}
--
GitLab