From e79d72165d82a10c5715901a6a5439508c65814d Mon Sep 17 00:00:00 2001 From: georgweiss Date: Wed, 3 Sep 2025 10:44:12 +0200 Subject: [PATCH] Fix import of save&restore legacy csv --- .../filehandler/csv/CSVParser.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/filehandler/csv/CSVParser.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/filehandler/csv/CSVParser.java index 947c9aab3e..57fe86416a 100644 --- a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/filehandler/csv/CSVParser.java +++ b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/filehandler/csv/CSVParser.java @@ -187,17 +187,19 @@ static public CSVParser parse(File csvFile) throws Exception { csvParser.getTags().add(tag); } - } else if (!line.startsWith(COMMENT_PREFIX) && csvParser.getColumnHeaders().isEmpty()) { - csvParser.analyzeColumnHeader(line); - } else { - String[] columns = csvParser.split(line); - - Map entry = new HashMap<>(); - for (int index = 0; index < columns.length; index++) { - entry.put(csvParser.getColumnHeaders().get(index), columns[index]); + } else if (!line.startsWith(COMMENT_PREFIX)) { + if(csvParser.getColumnHeaders().isEmpty()){ + csvParser.analyzeColumnHeader(line); } + else { + String[] columns = csvParser.split(line); - csvParser.getEntries().add(entry); + Map entry = new HashMap<>(); + for (int index = 0; index < columns.length; index++) { + entry.put(csvParser.getColumnHeaders().get(index), columns[index]); + } + csvParser.getEntries().add(entry); + } } }