Merge pull request #2594 from ControlSystemStudio/rdb_arch_null_text

RDB archive: Handle samples that have time but no value at all

Author: kasemir

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ValueWithInfoFormatter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010-2018 Oak Ridge National Laboratory.
+ * Copyright (c) 2010-2023 Oak Ridge National Laboratory.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,8 +8,6 @@
 package org.csstudio.trends.databrowser3.export;
 
 import org.csstudio.trends.databrowser3.Messages;
-import org.epics.vtype.VString;
-import org.epics.vtype.VStringArray;
 import org.epics.vtype.VType;
 import org.phoebus.archive.vtype.Style;
 import org.phoebus.archive.vtype.VTypeHelper;
@@ -40,12 +38,6 @@ public String getHeader()
     @Override
     public String format(final VType value)
     {
-        if (value instanceof VString
-                || value instanceof VStringArray
-                || Double.isNaN(VTypeHelper.toDouble(value)))
-            return super.format(value) +
-                Messages.Export_Delimiter + Messages.Export_NoValueMarker +
-                Messages.Export_Delimiter + Messages.Export_NoValueMarker;
         return super.format(value) + Messages.Export_Delimiter +
             org.phoebus.core.vtypes.VTypeHelper.getSeverity(value) + Messages.Export_Delimiter +
             VTypeHelper.getMessage(value);

app/databrowser/src/main/java/org/phoebus/archive/reader/rdb/AbstractRDBValueIterator.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017-2018 Oak Ridge National Laboratory.
+ * Copyright (c) 2017-2023 Oak Ridge National Laboratory.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.epics.util.array.ArrayDouble;
 import org.epics.util.stats.Range;
@@ -224,7 +225,7 @@ protected VType decodeSampleTableValue(final ResultSet result, final boolean han
 
         // Default to string
         final String txt = result.getString(6);
-        return VString.of(txt, alarm, time);
+        return VString.of(Objects.toString(txt), alarm, time);
     }
 
     /** @param severity Original severity

app/databrowser/src/main/java/org/phoebus/archive/reader/rdb/StoredProcedureValueIterator.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017-2020 Oak Ridge National Laboratory.
+ * Copyright (c) 2017-2023 Oak Ridge National Laboratory.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -219,7 +220,7 @@ private List<VType> decodeOptimizedTable(final ResultSet result) throws Exceptio
             // WB==-1 indicates a String sample
             final VType value;
             if (result.getInt(1) < 0)
-                value = VString.of(result.getString(8), alarm, time);
+                value = VString.of(Objects.toString(result.getString(8)), alarm, time);
             else
             {   // Only one value within averaging bucket?
                 final int cnt = result.getInt(9);