Changeset 2458

Timestamp:

May 23, 2014, 1:44:40 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #548: Register Demux and Merge as ended

Display failed demux jobs in the confirmation wizard.

Do not check 'align' for libraries that have 0 PF_READS.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/analysis/demux_confirm.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/DemuxMergeServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/analysis/demux_confirm.jsp

@@ -263 +263 @@
     else
     {
+      if (!merged.PF_READS) alignChecked = '';
       html += '<td class="dottedleft"><input type="checkbox" name="flag.'+merged.id+'"></td>';
     }

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

@@ -207 +207 @@
         // The job must be ended
         query.restrict(Restrictions.neq(Hql.property("ended"), null));
-        query.restrict(Restrictions.eq(Hql.property("status"), Expressions.integer(Job.Status.DONE.getValue())));
         // Join jobs for DemuxedSequences
         query.join(Hql.innerJoin("derivedBioAssays", "dba"));
@@ -225 +224 @@
         // The job must be ended and successful
         query.restrict(Restrictions.neq(Hql.property("ended"), null));
-        query.restrict(Restrictions.eq(Hql.property("status"), Expressions.integer(Job.Status.DONE.getValue())));
         // Join jobs for DemuxedSequences
         query.join(Hql.innerJoin("derivedBioAssays", "dba"));