Changeset 2535


Ignore:
Timestamp:
Jul 1, 2014, 11:55:56 AM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #593: Start masking and alignment

Reset AutoProcessing annotation when starting an alignment so that the bioassay disappears from the "Start masking and alignment" count and list.

Also use DISTINCT when counting or loading the list since otherwise the same bioassay will appear multiple times after a re-alignment.

File:
1 edited

Legend:

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

    r2499 r2535  
    116116            Restrictions.eq(Hql.alias("ap"), Expressions.string("ReProcess"))
    117117          ));
     118        query.setDistinct(true);
    118119        long count = query.count(dc);
    119120        json.put("count", count);
     
    139140            Restrictions.eq(Hql.alias("ap"), Expressions.string("ReProcess"))
    140141          ));
     142        query.setDistinct(true);
    141143        query.order(Orders.asc(Hql.property("name")));
    142144
     
    307309          DerivedBioAssay merged = DerivedBioAssay.getById(dc, mergedId.intValue());
    308310          String fastQFolder = (String)Annotationtype.DATA_FILES_FOLDER.getAnnotationValue(dc, merged);
     311          // Reset AUTO_PROCESSING annotation
     312          Annotationtype.AUTO_PROCESSING.setAnnotationValue(dc, merged, null);
    309313          Extract lib = merged.getExtract();
    310314          int ca_size = ((Number)Annotationtype.CA_SIZE.getAnnotationValue(dc, lib)).intValue();
Note: See TracChangeset for help on using the changeset viewer.