Added support for line number tumor identifiers.

Author: depryf

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Validation Framework Version History
 
+**Version 4.6**
+
+- Added a way to provide a line number as a tumor identifier in the simple NAACCR validatable.
+
 **Version 4.5**
 
 - Fixed behavior of translated edits that add extra error messages.

src/main/java/com/imsweb/validation/entities/SimpleNaaccrLinesValidatable.java

@@ -270,10 +270,22 @@ public Long getCurrentTumorId() {
         if (_currentLine == null)
             return null;
 
-        String tumorId = _currentLine.get("tumorRecordNumber");
-        if (!NumberUtils.isDigits(tumorId))
-            tumorId = _currentLine.get("sequenceNumberCentral");
-        return NumberUtils.isDigits(tumorId) ? Long.valueOf(tumorId) : null;
+        // if the line number is available, it's the best way to uniquely identify a tumor...
+        String lineNumber = _currentLine.get(Validatable.KEY_LINE_NUMBER);
+        if (lineNumber != null)
+            return Long.valueOf(lineNumber);
+
+        // otherwise, try to use the tumor record number
+        String tumorRecordNumber = _currentLine.get("tumorRecordNumber");
+        if (NumberUtils.isDigits(tumorRecordNumber))
+            return Long.valueOf(tumorRecordNumber);
+
+        // otherwise, try to use the sequence number central
+        String sequenceNumberCentral = _currentLine.get("sequenceNumberCentral");
+        if (NumberUtils.isDigits(sequenceNumberCentral))
+            return Long.valueOf(sequenceNumberCentral);
+
+        return null;
 
     }
 

src/main/java/com/imsweb/validation/entities/Validatable.java

@@ -17,6 +17,11 @@
  */
 public interface Validatable {
 
+    /**
+     * Key for the line number corresponding to the entity being validated; some validatable implementations might put this on their "line" data.
+     */
+    String KEY_LINE_NUMBER = "_lineNumber";
+
     /**
      * Key for the calculated CS staging schema ID that some validatable implementations put in the context of the executed edits.
      */