Changeset 1549


Ignore:
Timestamp:
Mar 6, 2012, 12:37:13 PM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #364: Put RNA aliquots on bioplate to be used by the Caliper machine

Adding two more annotation type checks (NDConc and QCHiSense)

Location:
extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java

    r1546 r1549  
    228228  */
    229229  public static final String ANNOTATION_BA_RIN = "BA_RIN";
    230 
     230 
     231  /**
     232    The name of the "NDConc" annotation, used for extract (DNA/RNA).
     233    It is a float annotation type.
     234    @since 2.4
     235  */
     236  public static final String ANNOTATION_ND_CONC = "NDConc";
     237
     238  /**
     239    The name of the "QCHiSense" annotation, used for
     240    extract (RNAQC). It is a boolean annotation type.
     241    @since 2.4
     242  */
     243  public static final String ANNOTATION_QC_HISENSE = "QCHiSense";
    231244 
    232245  /**
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1546 r1549  
    181181        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_PARTITION_DATE, new Item[]{Item.SAMPLE, Item.EXTRACT}, Type.DATE, 1,
    182182            null, effectiveOptions, createIfMissing));
    183         jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_QC_RUN_DATE, new Item[] { Item.BIOPLATE}, Type.DATE, 1,
    184             null, effectiveOptions, createIfMissing));
    185         jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_QC_OPERATOR, new Item[] { Item.BIOPLATE}, Type.STRING, 1,
    186             null, effectiveOptions, createIfMissing));
    187         jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_BA_RIN, new Item[] { Item.EXTRACT }, Type.FLOAT, 1,
     183        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_QC_RUN_DATE, Item.BIOPLATE, Type.DATE, 1,
     184            null, effectiveOptions, createIfMissing));
     185        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_QC_OPERATOR, Item.BIOPLATE, Type.STRING, 1,
     186            null, effectiveOptions, createIfMissing));
     187        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_QC_HISENSE, Item.EXTRACT, Type.BOOLEAN, 1,
     188            null, effectiveOptions, createIfMissing));
     189        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_BA_RIN, Item.EXTRACT, Type.FLOAT, 1,
     190            null, effectiveOptions, createIfMissing));
     191        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_ND_CONC, Item.EXTRACT, Type.FLOAT, 1,
    188192            null, effectiveOptions, createIfMissing));
    189193       
     
    214218       
    215219        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.RNA, createIfMissing,
    216             Reggie.ANNOTATION_QC_RUN_DATE, Reggie.ANNOTATION_QC_OPERATOR));
    217        
    218         jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.DNA, createIfMissing));
     220            Reggie.ANNOTATION_QC_RUN_DATE, Reggie.ANNOTATION_QC_OPERATOR, Reggie.ANNOTATION_ND_CONC));
     221       
     222        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.DNA, createIfMissing,
     223            Reggie.ANNOTATION_ND_CONC));
    219224
    220225        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.RNAQC, createIfMissing,
    221             Reggie.ANNOTATION_BA_RIN));
     226            Reggie.ANNOTATION_BA_RIN, Reggie.ANNOTATION_QC_HISENSE));
    222227       
    223228        json.put("checks", jsonChecks);
Note: See TracChangeset for help on using the changeset viewer.