Changeset 1977


Ignore:
Timestamp:
May 16, 2013, 11:02:38 AM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #422, #423, #478 and more... Added Operator annotation and use it for all steps in the library preparation and pooling.

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

Legend:

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

    r1959 r1977  
    349349  public static final Annotationtype PLATE_PROCESS_RESULT =
    350350    new Annotationtype("PlateProcessResult", Type.STRING, Item.BIOPLATE);
     351
     352  /**
     353    Generic "Operator" annotation on bioplates.
     354    @since 2.12
     355  */
     356  public static final Annotationtype OPERATOR =
     357    new Annotationtype("Operator", Type.STRING, Item.BIOPLATE);
     358
    351359 
    352360  /**
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1959 r1977  
    253253        jsonChecks.add(checkAnnotationType(dc, Annotationtype.POOL_CONC, 1, null, effectiveOptions, createIfMissing));
    254254        jsonChecks.add(checkAnnotationType(dc, Annotationtype.POOL_MOLARITY, 1, null, effectiveOptions, createIfMissing));
     255        jsonChecks.add(checkAnnotationType(dc, Annotationtype.OPERATOR, 1, null, effectiveOptions, createIfMissing));
    255256
    256257        // Annotation type categories
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/LibPrepServlet.java

    r1968 r1977  
    489489        Date libDate = Reggie.CONVERTER_STRING_TO_DATE.convert((String)jsonReq.get("libDate"));
    490490        libPlate.setEventDate(libDate);
     491        String operator = Values.getStringOrNull((String)jsonReq.get("libOperator"));
     492        Annotationtype.OPERATOR.setAnnotationValue(dc, libPlate, operator);
    491493        Protocol libProtocol = libProtocolId == null ? null : Protocol.getById(dc, libProtocolId.intValue());
    492        
    493494       
    494495        if (failed)
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/MRnaServlet.java

    r1949 r1977  
    529529        // Operator is an annotation
    530530        String operator = Values.getStringOrNull((String)jsonReq.get("mrnaOperator"));
    531         Annotationtype.QC_OPERATOR.setAnnotationValue(dc, mrnaPlate, operator);
     531        Annotationtype.OPERATOR.setAnnotationValue(dc, mrnaPlate, operator);
    532532       
    533533        // Comment about the plate
     
    656656        // Operator is an annotation
    657657        String operator = Values.getStringOrNull((String)jsonReq.get("cdnaOperator"));
    658         Annotationtype.QC_OPERATOR.setAnnotationValue(dc, cdnaPlate, operator);
     658        Annotationtype.OPERATOR.setAnnotationValue(dc, cdnaPlate, operator);
    659659       
    660660        // Comment about the plate
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PoolServlet.java

    r1976 r1977  
    421421          creationEvent.setProtocol(poolProtocol);
    422422          poolExtract.setDescription(comment);
     423          Annotationtype.OPERATOR.setAnnotationValue(dc, poolExtract, operator);
    423424         
    424425          // Check if there are any .dil items
Note: See TracChangeset for help on using the changeset viewer.