Bug fix to the stat pages

[jabaws.git] / statpages / Statistics.jsp

diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index 752d047..9cef911 100644 (file)
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -8,22 +8,27 @@ Date: May 2011
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>\r
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>\r
 \r
-<jsp:include page="header.jsp" />\r
+<c:import url="header.jsp" >\r
+       <c:param name="title">JABAWS Usage Statistics</c:param>\r
+</c:import>  \r
     \r
 <div style="margin: 20px ">    \r
 \r
 <h2>JABAWS Usage Statistics for the Period: <fmt:formatDate value="${startDate}" /> to <fmt:formatDate value="${stopDate}"/></h2>\r
 <h2>All Jobs</h2>\r
+<c:set var="where"  value="everywhere" scope="request"/>\r
 <c:set var="statistics"  value="${stat.allStat}" scope="request"/>\r
 <c:set var="totals" value="${statTotal}" scope="request"/>\r
 <c:import url="StatisticsTable.jsp"/> \r
 \r
 <h2>Local Jobs</h2>\r
+<c:set var="where"  value="local" scope="request"/>\r
 <c:set var="statistics"  value="${stat.localStat}" scope="request"/>\r
 <c:set var="totals" value="${statTotalLocal}" scope="request"/>\r
 <c:import url="StatisticsTable.jsp"/>\r
        \r
 <h2>Cluster Jobs</h2>\r
+<c:set var="where"  value="cluster" scope="request"/>\r
 <c:set var="statistics"  value="${stat.clusterStat}" scope="request"/>\r
 <c:set var="totals" value="${statTotalCluster}" scope="request"/>\r
 <c:import url="StatisticsTable.jsp"/>\r
@@ -41,7 +46,7 @@ time specified in the title.</p>
 Each table contains the following information for each web service  \r
 <ul>\r
        <li>Total - the total number of jobs accepted by a particular JABA service</li>\r
-       <li>Incomplete - the number of jobs for which the result file was not found or was empty</li>\r
+       <li>Incomplete - the number of jobs for which the result file was not found or was empty excluding cancelled</li>\r
        <li>Cancelled - the number of jobs cancelled by the user</li>\r
        <li>Abandoned - the number of jobs which result(s) were not collected</li>\r
 </ul>\r