import compbio.cassandra.DateFormatter;
/**
+ * MVC controller for direct interaction with the internal DB
+ *
* @author Alexander Sherstnev
* @author Natasha Sherstneva
+ *
+ * @version 1.0
+ * @since Nov 2013
*/
@Controller
public class DatabaseController extends BasicController {
model.put("seq", sequence);
CassandraRemover cr = new CassandraRemover();
- int njobs = 0;
+ int njobs1 = 0;
+ int njobs2 = 0;
+ int njobs3 = 0;
+ int njobs4 = 0;
if (byId.equals("on,off"))
- njobs = cr.RemoveJobById(jobid);
+ njobs1 = cr.RemoveJobById(jobid);
if (byDate.equals("on,off")) {
long longDate1 = DateFormatter.DateParsing(date1, formaterYYMMDD) / 1000;
long longDate2 = DateFormatter.DateParsing(date2, formaterYYMMDD) / 1000;
int timerange = (int)(longDate2 - longDate1) /24 / 3600 + 1;
model.put("ndays", timerange);
- njobs = cr.RemoveJobByDate(date1, date2);
+ njobs2 = cr.RemoveJobByDate(date1, date2);
}
if (byIp.equals("on,off"))
- njobs = cr.RemoveJobByIp(ip);
+ njobs3 = cr.RemoveJobByIp(ip);
if (bySequence.equals("on,off"))
- njobs = cr.RemoveJobBySequence(sequence);
- model.put("njobs", njobs);
+ njobs4 = cr.RemoveJobBySequence(sequence);
+ model.put("njobs", njobs1 + njobs2 + njobs3 + njobs4);
+ model.put("njobsbyDate", njobs2);
+ model.put("njobsbyIP", njobs3);
+ model.put("njobsbySeq", njobs4);
return "reports/RemoveJobs";
}
<body>
<div class="container">
<jsp:include page="../fragments/mainmenu.jsp" />
- <spring:url value="/sequence/sequence/results" var="sequence_query" />
+ <spring:url value="/sequence/results" var="sequence_query" />
<spring:url value="/admin/ip/results" var="ip_query" />
<div class="panel panel-default">
- <div class="panel-heading">
- <p style="font-weight:bold;">Information for removed jobs</p>
- </div>
- <div class="panel-body">
- <!-- <div class="grid-wrapper-div">-->
- <c:if test="${byDate != 'off'}">
- <p>${njobs} jobs have been removed for time period: <c:out value="${date1}" /> to <c:out value="${date2}"/> (${ndays} days)</p>
- </c:if>
- <c:if test="${byId != 'off'}">
- <p>Job ${id} has been removed.</p>
- </c:if>
- <c:if test="${byIp != 'off'}">
- <p>Jobs launched from ${ip} have been removed. ${njobs} jobs have been removed.</p>
- </c:if>
- <c:if test="${bySequence != 'off'}">
- <p>Jobs launched with sequence ${seq} have been removed. ${njobs} jobs have been removed.</p>
- </c:if>
- <!-- </div>-->
- </div>
+ <div class="panel-heading">
+ <p style="font-weight:bold;">Information on removed jobs</p>
+ </div>
+ <div class="panel-body">
+ <c:choose>
+ <c:when test="${njobs > 0}">
+ <c:if test="${byDate != 'off'}">
+ <p>${njobsbyDate} jobs have been removed for the time period: ${date1} to ${date2} (${ndays} days)</p>
+ </c:if>
+ <c:if test="${byId != 'off'}">
+ <p>Job ${id} has been removed.</p>
+ </c:if>
+ <c:if test="${byIp != 'off'}">
+ <p>Jobs launched from ${ip} have been removed. ${njobsbyIp} jobs have been removed.</p>
+ </c:if>
+ <c:if test="${bySequence != 'off'}">
+ <p>Jobs launched with sequence ${seq} have been removed. ${njobsbySeq} jobs have been removed.</p>
+ </c:if>
+ </c:when>
+ <c:otherwise>
+ <p>No jobs has been removed.</p>
+ </c:otherwise>
+ </c:choose>
+ </div>
</div>
<jsp:include page="../fragments/footer.jsp" />
</div>
</body>
-</html>
\ No newline at end of file
+</html>