(#3003) Handle lines with missing run type

quince-science · Nov 14, 2024 · f70da8b · f70da8b
1 parent 516c172
commit f70da8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/WebApp/src/uk/ac/exeter/QuinCe/data/Instrument/FileDefinition.java b/WebApp/src/uk/ac/exeter/QuinCe/data/Instrument/FileDefinition.java
@@ -977,7 +977,9 @@ public RunTypeAssignment getRunType(List<String> line, boolean followAlias)
    */
   public RunTypeCategory getRunTypeCategory(String line)
     throws FileDefinitionException {
-    return getRunType(line, true).getCategory();
+
+    RunTypeAssignment assignment = getRunType(line, true);
+    return null == assignment ? null : assignment.getCategory();
   }
 
   /**

diff --git a/WebApp/src/uk/ac/exeter/QuinCe/jobs/files/ExtractDataSetJob.java b/WebApp/src/uk/ac/exeter/QuinCe/jobs/files/ExtractDataSetJob.java
@@ -161,9 +161,17 @@ protected void execute(JobThread thread) throws JobFailedException {
 
             if (fileDefinition.hasRunTypes()) {
               try {
-                RunTypeCategory runType = fileDefinition.getRunType(line, true)
-                  .getCategory();
-                if (runType.equals(RunTypeCategory.IGNORED)) {
+                RunTypeCategory runType = null;
+
+                RunTypeAssignment runTypeAssignment = fileDefinition
+                  .getRunType(line, true);
+
+                if (null != runTypeAssignment) {
+                  runType = runTypeAssignment.getCategory();
+                }
+
+                if (null != runType
+                  && runType.equals(RunTypeCategory.IGNORED)) {
                   checkColumnCount = false;
                 }
               } catch (FileDefinitionException e) {