eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-17 11:19:15 +00:00
Code Activity

fixed time point parsing for Expedition files that have certain time columns but without values

Browse Source 
Change-Id: Ib0441e42cc133b092b79a63da1ac680e1898a877
This commit is contained in:
Axel Uhl
2018-04-25 12:00:11 +02:00
parent ede9b05b7b
commit c42539d4ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/ExpeditionExtendedDataImporterImpl.java
+4 -4
View File
@@ -256,12 +256,12 @@ public class ExpeditionExtendedDataImporterImpl extends AbstractDoubleVectorFixI
final TimePoint timePoint;
final String date;
final String dateFormatPattern;
if (columnsInFileFromHeader.containsKey(GPS_TIME_COLUMN)) {
if (columnsInFileFromHeader.containsKey(GPS_TIME_COLUMN) && !lineContentTokens[columnsInFileFromHeader.get(GPS_TIME_COLUMN)].trim().isEmpty()) {
timePoint = getTimePoint(lineContentTokens[columnsInFileFromHeader.get(GPS_TIME_COLUMN)]);
} else if (columnsInFileFromHeader.containsKey(UTC_COLUMN)) {
} else if (columnsInFileFromHeader.containsKey(UTC_COLUMN) && !lineContentTokens[columnsInFileFromHeader.get(UTC_COLUMN)].trim().isEmpty()) {
timePoint = getTimePoint(lineContentTokens[columnsInFileFromHeader.get(UTC_COLUMN)]);
} else if (columnsInFileFromHeader.containsKey(DATE_COLUMN_1)
|| columnsInFileFromHeader.containsKey(DATE_COLUMN_2)) {
} else if (columnsInFileFromHeader.containsKey(DATE_COLUMN_1) && !lineContentTokens[columnsInFileFromHeader.get(DATE_COLUMN_1)].trim().isEmpty()
|| columnsInFileFromHeader.containsKey(DATE_COLUMN_2) && !lineContentTokens[columnsInFileFromHeader.get(DATE_COLUMN_2)].trim().isEmpty()) {
if (columnsInFileFromHeader.containsKey(DATE_COLUMN_1)) {
date = lineContentTokens[columnsInFileFromHeader.get(DATE_COLUMN_1)];
dateFormatPattern = DATE_COLUMN_1_PATTERN;