Changeset 2102


Ignore:
Timestamp:
Oct 25, 2013, 8:24:38 AM (9 years ago)
Author:
Nicklas Nordborg
Message:

References #502: Design flow cells

Removed ReadString annotation from FlowCell subtype. Expected to be re-used later on so definition is kept in the code.

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/dao/Annotationtype.java

    r2087 r2102  
    582582 
    583583  /**
    584     The "ReadString" annotation, used for physical bioassays (FlowCell).
     584    The "ReadString" annotation. Currently not in use...
    585585    @since 2.13
    586586  */
    587587  public static final Annotationtype READ_STRING =
    588     new Annotationtype("ReadString", Type.STRING, Item.PHYSICALBIOASSAY);
     588    new Annotationtype("ReadString", Type.STRING);
    589589
    590590  /**
     
    746746    ItemQuery<AnnotationType> query = AnnotationType.getQuery(null);
    747747    query.restrict(Restrictions.eq(Hql.property("name"), Expressions.parameter("name", name, Type.STRING)));
    748     query.joinPermanent(Hql.innerJoin("itemTypes", "it"));
    749748   
    750749    Item[] mt = getMainType();
     
    754753      mainTypes[i] = Expressions.integer(mt[i].getValue());
    755754    }
    756     query.restrictPermanent(Restrictions.in(Hql.alias("it"), mainTypes));
     755    if (mainTypes.length > 0)
     756    {
     757      query.joinPermanent(Hql.innerJoin("itemTypes", "it"));
     758      query.restrictPermanent(Restrictions.in(Hql.alias("it"), mainTypes));
     759    }
    757760
    758761    query.include(Include.ALL);
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r2095 r2102  
    377377        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.FLOW_CELL, createIfMissing,
    378378            Annotationtype.FLOWCELL_ID, Annotationtype.CLUSTER_START, Annotationtype.CLUSTER_OPERATOR,
    379             Annotationtype.SEQUENCING_CYCLES, Annotationtype.READ_STRING, Annotationtype.HISEQ_POSITION,
     379            Annotationtype.SEQUENCING_CYCLES, Annotationtype.HISEQ_POSITION,
    380380            Annotationtype.PLATE_PROCESS_RESULT));
    381381       
Note: See TracChangeset for help on using the changeset viewer.