Changeset 6477

Timestamp:

Nov 5, 2021, 11:53:20 AM (15 months ago)

Author:

Nicklas Nordborg

Message:

References #1346: Implement support for OncoArray? SNP data

Added Scanner subtype.

Location:

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie

Files:

• dao/Subtype.java (modified) (1 diff)
• servlet/InstallServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Subtype.java

@@ -262 +262 @@
   */
   public static final Subtype SCAN = new Subtype("Scan", "Scan", null, null, Item.DERIVEDBIOASSAY, false);
+
+  /**
+    The definition of the "Scanner" hardware type. Should already exist in BASE.
+    @since 4.34
+  */
+  public static final Subtype SCANNER = new Subtype("Scanner", null, null, null, Item.HARDWARE, false);
 
   /**

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

@@ -313 +313 @@
         jsonChecks.add(checkSubtype(dc, Subtype.FLOW_CELL, null, createIfMissing, Subtype.POOLED_LIBRARY_ALIQUOT, Subtype.CLUSTER_GENERATOR, Subtype.CLUSTER_PROTOCOL)); 
         jsonChecks.add(checkSubtype(dc, Subtype.BEAD_CHIP, null, createIfMissing, Subtype.BLOOD_DNA)); 
-        jsonChecks.add(checkSubtype(dc, Subtype.SCAN, null, createIfMissing, Subtype.BEAD_CHIP));
+        jsonChecks.add(checkSubtype(dc, Subtype.SCANNER, null, createIfMissing));
+        jsonChecks.add(checkSubtype(dc, Subtype.SCAN, null, createIfMissing, Subtype.BEAD_CHIP, Subtype.SCANNER));
         jsonChecks.add(checkSubtype(dc, Subtype.GENOTYPING_SOFTWARE, null, createIfMissing));
         jsonChecks.add(jsonSubtype_GENOTYPE_CALL_FILE);
@@ -1071 +1072 @@
             Annotationtype.ANALYSIS_RESULT,
             Annotationtype.PIPELINE
+          ));
+        
+        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.SCANNER, createIfMissing, 
+            Annotationtype.SERIAL_NUMBER
           ));