manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1689231 [10/13] - in /manifoldcf/trunk: ./ framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/ framework/core/src/main/java/org/apache/manifoldcf/core/auth/ framework/core/src/main/java/org/apache/manifoldcf/core/interfac...
Date Sun, 05 Jul 2015 10:18:00 GMT
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1689231&r1=1689230&r2=1689231&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp Sun Jul  5 10:17:59 2015
@@ -20,187 +20,27 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
-
 %>
 
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ApacheManifoldCFActivityResultReport")%>
-  </title>
-
-  <script type="text/javascript">
-  <!--
-
-  function Go()
-  {
-    if (!isInteger(report.rowcount.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EnterALegalNumberForRowsPerPage")%>");
-      report.rowcount.focus();
-      return;
-    }
-
-    if (report.reportbucketdesc.value == "")
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionCannotBeEmpty")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-
-    if (report.reportresultdesc.value == "")
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionCannotBeEmpty")%>");
-      report.reportresultdesc.focus();
-      return;
-    }
-
-    if (!isRegularExpression(report.reportbucketdesc.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-
-    if (!isRegularExpression(report.reportresultdesc.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportresultdesc.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportresultdesc.focus();
-      return;
-    }
-
-    if (!isRegularExpression(report.reportentitymatch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
-      report.reportentitymatch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultcodematch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
-      report.reportresultcodematch.focus();
-      return;
-    }
-
-    document.report.op.value="Report";
-    document.report.action = document.report.action + "#MainButton";
-    document.report.submit();
-  }
-
-  function Continue()
-  {
-    if (!isRegularExpression(report.reportentitymatch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
-      report.reportentitymatch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultcodematch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
-      report.reportresultcodematch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportbucketdesc.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultdesc.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportresultdesc.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportresultdesc.focus();
-      return;
-    }
-
-    document.report.op.value="Continue";
-    document.report.action = document.report.action + "#MainButton";
-    document.report.submit();
-  }
-
-  function ColumnClick(colname)
-  {
-    document.report.clickcolumn.value = colname;
-    Go();
-  }
-
-  function SetPosition(amt)
-  {
-    if (amt < 0)
-      amt = 0;
-    document.report.startrow.value = amt;
-    Go();
-  }
-
-  function isRegularExpression(value)
+<%
+try
+{
+  // Check if authorized
+  if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_VIEW_REPORTS))
   {
-    try
-    {
-      var foo = "teststring";
-                        foo.search(value.replace(/\(\?i\)/,""));
-      return true;
-    }
-    catch (e)
-    {
-      return false;
-    }
-
+    variableContext.setParameter("target","index.jsp");
+%>
+    <jsp:forward page="unauthorized.jsp"/>
+<%
   }
 
-  function isInteger(value)
+  if (org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway())
   {
-    var anum=/(^\d+$)/;
-    return anum.test(value);
-  }
-
-  //-->
-  </script>
-
-
-</head>
-
-<body class="standardbody">
-
-    <table class="page">
-      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
-      <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
-       <td class="window">
-  <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ActivityResultReport")%></p>
+%>
+    <jsp:forward page="maintenanceunderway.jsp"/>
 <%
-if (maintenanceUnderway == false)
-{
+  }
+  
   int k;
 
   // Read the parameters.
@@ -393,18 +233,194 @@ if (maintenanceUnderway == false)
     }
   }
 
+
 %>
-  <form class="standardform" name="report" action="execute.jsp" method="POST">
-    <input type="hidden" name="op" value="Continue"/>
-    <input type="hidden" name="type" value="resultreport"/>
-    <table class="displaytable">
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Connection")%></td><td class="value" colspan="1">
-          <select name="reportconnection" size="3">
-            <option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html>
+<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+  <title>
+    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ApacheManifoldCFActivityResultReport")%>
+  </title>
+
+  <script type="text/javascript">
+  <!--
+
+function Go()
+{
+  if (!isInteger(report.rowcount.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EnterALegalNumberForRowsPerPage")%>");
+    report.rowcount.focus();
+    return;
+  }
+
+  if (report.reportbucketdesc.value == "")
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionCannotBeEmpty")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  
+  if (report.reportresultdesc.value == "")
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionCannotBeEmpty")%>");
+    report.reportresultdesc.focus();
+    return;
+  }
+
+  if (!isRegularExpression(report.reportbucketdesc.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+
+  if (!isRegularExpression(report.reportresultdesc.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportresultdesc.focus();
+    return;
+  }
+  if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportresultdesc.focus();
+    return;
+  }
+
+  if (!isRegularExpression(report.reportentitymatch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
+    report.reportentitymatch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultcodematch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+    report.reportresultcodematch.focus();
+    return;
+  }
+
+  document.report.op.value="Report";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
+
+function Continue()
+{
+  if (!isRegularExpression(report.reportentitymatch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
+    report.reportentitymatch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultcodematch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+    report.reportresultcodematch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportbucketdesc.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultdesc.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportresultdesc.focus();
+    return;
+  }
+  if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportresultdesc.focus();
+    return;
+  }
+
+  document.report.op.value="Continue";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
+
+function ColumnClick(colname)
+{
+  document.report.clickcolumn.value = colname;
+  Go();
+}
+
+function SetPosition(amt)
+{
+  if (amt < 0)
+    amt = 0;
+  document.report.startrow.value = amt;
+  Go();
+}
+
+function isRegularExpression(value)
+{
+  try
+  {
+    var foo = "teststring";
+    foo.search(value.replace(/\(\?i\)/,""));
+    return true;
+  }
+  catch (e)
+  {
+    return false;
+  }
+}
+
+function isInteger(value)
+{
+  var anum=/(^\d+$)/;
+  return anum.test(value);
+}
+
+  //-->
+  </script>
+
+
+</head>
+
+<body class="standardbody">
+
+  <table class="page">
+    <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
+    <tr>
+      <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
+      <td class="window">
+        <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ActivityResultReport")%></p>
+        <form class="standardform" name="report" action="execute.jsp" method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="resultreport"/>
+          <table class="displaytable">
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Connection")%></td><td class="value" colspan="1">
+                <select name="reportconnection" size="3">
+                  <option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
 <%
   int i = 0;
   while (i < connList.length)
@@ -415,278 +431,284 @@ if (maintenanceUnderway == false)
     if (thisDescription == null || thisDescription.length() == 0)
       thisDescription = thisConnectionName;
 %>
-            <option <%=(thisConnectionName.equals(reportConnection))?"selected=\"selected\"":""%> value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisConnectionName)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
+                  <option <%=(thisConnectionName.equals(reportConnection))?"selected=\"selected\"":""%> value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisConnectionName)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
 <%
   }
 %>
-          </select>
-        </td>
+                </select>
+              </td>
 <%
   if (reportConnection.length() > 0)
   {
 %>
-        <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Activities")%></td><td class="value" colspan="1">
-          <input type="hidden" name="reportactivities_posted" value="true"/>
-          <select multiple="true" name="reportactivities" size="3">
+              <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Activities")%></td><td class="value" colspan="1">
+                <input type="hidden" name="reportactivities_posted" value="true"/>
+                <select multiple="true" name="reportactivities" size="3">
 <%
       i = 0;
       while (i < activityList.length)
       {
     String activity = activityList[i++];
 %>
-            <option <%=((selectedActivities.get(activity)==null)?"":"selected=\"selected\"")%> value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(activity)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(activity)%></option>
+                  <option <%=((selectedActivities.get(activity)==null)?"":"selected=\"selected\"")%> value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(activity)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(activity)%></option>
 <%
       }
 %>
-          </select>
-        </td>
+                </select>
+              </td>
 <%
   }
   else
   {
 %>
-        <td class="value" colspan="2"></td>
+              <td class="value" colspan="2"></td>
 <%
   }
 %>
 
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.StartTime")%></td>
-        <td class="value" colspan="3">
-            <select class="schedulepulldown" name='reportstarthour' size="3">
-          <option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-<%
-          k = 0;
-          while (k < 24)
-          {
-            int q = k;
-            String ampm;
-            if (k < 12)
-              ampm = "am";
-            else
-            {
-              ampm = "pm";
-              q -= 12;
-            }
-            String hour;
-            if (q == 0)
-              q = 12;
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.StartTime")%></td>
+              <td class="value" colspan="3">
+                <select class="schedulepulldown" name='reportstarthour' size="3">
+                  <option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<%
+  k = 0;
+  while (k < 24)
+  {
+    int q = k;
+    String ampm;
+    if (k < 12)
+      ampm = "am";
+    else
+    {
+      ampm = "pm";
+      q -= 12;
+    }
+    String hour;
+    if (q == 0)
+      q = 12;
 %>
-            <option value='<%=k%>' <%=(startHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
+                  <option value='<%=k%>' <%=(startHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
 <%						
-            k++;
-          }
+    k++;
+  }
+%>
+                </select><nobr/>:<nobr/>
+                <select class="schedulepulldown" name='reportstartminute' size="3">
+                  <option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<%
+  k = 0;
+  while (k < 60)
+  {
+%>
+                  <option value='<%=k%>' <%=(startMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
+<%
+    k++;
+  }
+%>
+                </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%>
+                <select class="schedulepulldown" name='reportstartmonth' size="3">
+                  <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+                  <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
+                  <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
+                  <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
+                  <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
+                  <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
+                  <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
+                  <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
+                  <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
+                  <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
+                  <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
+                  <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
+                  <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
+                </select><nobr/>
+                <select class="schedulepulldown" name='reportstartday' size="3">
+                  <option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<%
+  k = 0;
+  while (k < 31)
+  {
+    int value = (k+1) % 10;
+    String suffix;
+    if (value == 1 && k != 10)
+      suffix = "st";
+    else if (value == 2 && k != 11)
+      suffix = "nd";
+    else if (value == 3 && k != 12)
+      suffix = "rd";
+    else
+      suffix = "th";
+%>
+                  <option value='<%=Integer.toString(k)%>' <%=(startDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
+<%
+    k++;
+  }
 %>
-            </select><nobr/>:<nobr/>
-            <select class="schedulepulldown" name='reportstartminute' size="3">
-          <option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-<%
-          k = 0;
-          while (k < 60)
-          {
-%>
-            <option value='<%=k%>' <%=(startMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
-<%
-            k++;
-          }
-%>
-            </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%>
-            <select class="schedulepulldown" name='reportstartmonth' size="3">
-          <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-          <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
-          <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
-          <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
-          <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
-          <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
-          <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
-          <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
-          <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
-          <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
-          <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
-          <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
-          <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
-            </select><nobr/>
-            <select class="schedulepulldown" name='reportstartday' size="3">
-          <option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-<%
-          k = 0;
-          while (k < 31)
-          {
-            int value = (k+1) % 10;
-            String suffix;
-            if (value == 1 && k != 10)
-              suffix = "st";
-            else if (value == 2 && k != 11)
-              suffix = "nd";
-            else if (value == 3 && k != 12)
-              suffix = "rd";
-            else
-              suffix = "th";
-%>
-            <option value='<%=Integer.toString(k)%>' <%=(startDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
-<%
-            k++;
-          }
-%>
-            </select><nobr/>,<nobr/>
-            <select class="schedulepulldown" name='reportstartyear' size="3">
-          <option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-          <option value="2005" <%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
-          <option value="2006" <%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
-          <option value="2007" <%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
-          <option value="2008" <%=(startYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
-          <option value="2009" <%=(startYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
-          <option value="2010" <%=(startYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
-          <option value="2011" <%=(startYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
-          <option value="2012" <%=(startYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
-          <option value="2013" <%=(startYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
-          <option value="2014" <%=(startYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
-          <option value="2015" <%=(startYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
-            </select>
-        </td>
-      </tr>
-      <tr>
-        <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%></td>
-        <td class="value" colspan="3">
-            <select class="schedulepulldown" name='reportendhour' size="3">
-          <option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-<%
-          k = 0;
-          while (k < 24)
-          {
-            int q = k;
-            String ampm;
-            if (k < 12)
-              ampm = "am";
-            else
-            {
-              ampm = "pm";
-              q -= 12;
-            }
-            String hour;
-            if (q == 0)
-              q = 12;
+                </select><nobr/>,<nobr/>
+                <select class="schedulepulldown" name='reportstartyear' size="3">
+                  <option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+                  <option value="2005" <%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
+                  <option value="2006" <%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
+                  <option value="2007" <%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
+                  <option value="2008" <%=(startYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
+                  <option value="2009" <%=(startYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
+                  <option value="2010" <%=(startYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
+                  <option value="2011" <%=(startYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
+                  <option value="2012" <%=(startYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
+                  <option value="2013" <%=(startYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
+                  <option value="2014" <%=(startYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
+                  <option value="2015" <%=(startYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
+                  <option value="2016" <%=(startYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
+                  <option value="2017" <%=(startYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
+                  <option value="2018" <%=(startYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+                </select>
+              </td>
+            </tr>
+            <tr>
+              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%></td>
+              <td class="value" colspan="3">
+                <select class="schedulepulldown" name='reportendhour' size="3">
+                  <option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<%
+  k = 0;
+  while (k < 24)
+  {
+    int q = k;
+    String ampm;
+    if (k < 12)
+      ampm = "am";
+    else
+    {
+      ampm = "pm";
+      q -= 12;
+    }
+    String hour;
+    if (q == 0)
+      q = 12;
 %>
-            <option value='<%=k%>' <%=(endHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
+                  <option value='<%=k%>' <%=(endHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
 <%						
-            k++;
-          }
+    k++;
+  }
 %>
-            </select><nobr/>:<nobr/>
-            <select class="schedulepulldown" name='reportendminute' size="3">
-          <option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-<%
-          k = 0;
-          while (k < 60)
-          {
-%>
-            <option value='<%=k%>' <%=(endMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
-<%
-            k++;
-          }
-%>
-            </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%>
-            <select class="schedulepulldown" name='reportendmonth' size="3">
-          <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-          <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
-          <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
-          <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
-          <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
-          <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
-          <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
-          <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
-          <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
-          <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
-          <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
-          <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
-          <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
-            </select><nobr/>
-            <select class="schedulepulldown" name='reportendday' size="3">
-          <option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-<%
-          k = 0;
-          while (k < 31)
-          {
-            int value = (k+1) % 10;
-            String suffix;
-            if (value == 1 && k != 10)
-              suffix = "st";
-            else if (value == 2 && k != 11)
-              suffix = "nd";
-            else if (value == 3 && k != 12)
-              suffix = "rd";
-            else
-              suffix = "th";
-%>
-            <option value='<%=Integer.toString(k)%>' <%=(endDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
-<%
-            k++;
-          }
-%>
-            </select><nobr/>,<nobr/>
-            <select class="schedulepulldown" name='reportendyear' size="3">
-          <option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
-          <option value="2005" <%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
-          <option value="2006" <%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
-          <option value="2007" <%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
-          <option value="2008" <%=(endYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
-          <option value="2009" <%=(endYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
-          <option value="2010" <%=(endYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
-          <option value="2011" <%=(endYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
-          <option value="2012" <%=(endYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
-          <option value="2013" <%=(endYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
-          <option value="2014" <%=(endYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
-          <option value="2015" <%=(endYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
-            </select>
-        </td>
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-      <tr>
-        <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%></nobr></td>
-        <td class="value"><input type="text" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
-        <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%></nobr></td>
-        <td class="value"><input type="text" name="reportresultcodematch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-
-      <tr>
-        <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%></nobr></td>
-        <td class="value"><input type="text" name="reportbucketdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportBucketDesc)%>'/></td>
-        <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%></nobr></td>
-        <td class="value"><input type="text" name="reportresultdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportResultDesc)%>'/></td>
-      </tr>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
-        <td class="message" colspan="4">
+                </select><nobr/>:<nobr/>
+                <select class="schedulepulldown" name='reportendminute' size="3">
+                  <option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<%
+  k = 0;
+  while (k < 60)
+  {
+%>
+                  <option value='<%=k%>' <%=(endMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
+<%
+    k++;
+  }
+%>
+                </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%>
+                <select class="schedulepulldown" name='reportendmonth' size="3">
+                  <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+                  <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
+                  <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
+                  <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
+                  <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
+                  <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
+                  <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
+                  <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
+                  <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
+                  <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
+                  <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
+                  <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
+                  <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
+                </select><nobr/>
+                <select class="schedulepulldown" name='reportendday' size="3">
+                  <option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<%
+  k = 0;
+  while (k < 31)
+  {
+    int value = (k+1) % 10;
+    String suffix;
+    if (value == 1 && k != 10)
+      suffix = "st";
+    else if (value == 2 && k != 11)
+      suffix = "nd";
+    else if (value == 3 && k != 12)
+      suffix = "rd";
+    else
+      suffix = "th";
+%>
+                  <option value='<%=Integer.toString(k)%>' <%=(endDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
+<%
+    k++;
+  }
+%>
+                </select><nobr/>,<nobr/>
+                <select class="schedulepulldown" name='reportendyear' size="3">
+                  <option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+                  <option value="2005" <%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
+                  <option value="2006" <%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
+                  <option value="2007" <%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
+                  <option value="2008" <%=(endYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
+                  <option value="2009" <%=(endYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
+                  <option value="2010" <%=(endYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
+                  <option value="2011" <%=(endYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
+                  <option value="2012" <%=(endYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
+                  <option value="2013" <%=(endYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
+                  <option value="2014" <%=(endYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
+                  <option value="2015" <%=(endYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
+                  <option value="2016" <%=(endYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
+                  <option value="2017" <%=(endYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
+                  <option value="2018" <%=(endYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+                </select>
+              </td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%></nobr></td>
+              <td class="value"><input type="text" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
+              <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%></nobr></td>
+              <td class="value"><input type="text" name="reportresultcodematch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+
+            <tr>
+              <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%></nobr></td>
+              <td class="value"><input type="text" name="reportbucketdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportBucketDesc)%>'/></td>
+              <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%></nobr></td>
+              <td class="value"><input type="text" name="reportresultdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportResultDesc)%>'/></td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+              <td class="message" colspan="4">
 <%
   if (reportConnection.length() > 0)
   {
 %>
-          <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/></a>
+                <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/></a>
 <%
   }
   else
   {
 %>
-          <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/></a>
+                <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/></a>
 <%
   }
 %>
-        </td>
-      <tr>
-        <td class="separator" colspan="4"><hr/></td>
-      </tr>
+              </td>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
 
-    </table>
+          </table>
 <%
   if (reportConnection.length() > 0)
   {
@@ -739,118 +761,118 @@ if (maintenanceUnderway == false)
     IResultSet set = connMgr.genHistoryResultCodes(reportConnection,criteria,sortOrder,resultBucket,idBucket,startRow,rowCount+1);
 
 %>
-    <input type="hidden" name="clickcolumn" value=""/>
-    <input type="hidden" name="startrow" value='<%=Integer.toString(startRow)%>'/>
-    <input type="hidden" name="sortorder" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
-
-    <table class="displaytable">
-        <tr class="headerrow">
-      <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%></nobr></a></td>
-      <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%></nobr></a></td>
-        </tr>
+          <input type="hidden" name="clickcolumn" value=""/>
+          <input type="hidden" name="startrow" value='<%=Integer.toString(startRow)%>'/>
+          <input type="hidden" name="sortorder" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
+
+          <table class="displaytable">
+            <tr class="headerrow">
+              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%></nobr></a></td>
+            </tr>
 <%
     zz = 0;
     boolean hasMoreRows = (set.getRowCount() > rowCount);
     int iterCount = hasMoreRows?rowCount:set.getRowCount();
     while (zz < iterCount)
     {
-        IResultRow row = set.getRow(zz);
-        Object idBucketObject = row.getValue("idbucket");
-        String idBucketString;
-        if (idBucketObject == null)
-      idBucketString = "";
-        else
-      idBucketString = idBucketObject.toString();
-        Object resultCodeBucketObject = row.getValue("resultcodebucket");
-        String resultCodeBucketString;
-        if (resultCodeBucketObject == null)
-      resultCodeBucketString = "";
-        else
-      resultCodeBucketString = resultCodeBucketObject.toString();
-%>
-        <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
-            <td class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
-            <td class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCodeBucketString)%></nobr></td>
-            <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("eventcount").toString())%></td>
-        </tr>
+      IResultRow row = set.getRow(zz);
+      Object idBucketObject = row.getValue("idbucket");
+      String idBucketString;
+      if (idBucketObject == null)
+        idBucketString = "";
+      else
+        idBucketString = idBucketObject.toString();
+      Object resultCodeBucketObject = row.getValue("resultcodebucket");
+      String resultCodeBucketString;
+      if (resultCodeBucketObject == null)
+        resultCodeBucketString = "";
+      else
+        resultCodeBucketString = resultCodeBucketObject.toString();
+%>
+            <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
+              <td class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCodeBucketString)%></nobr></td>
+              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("eventcount").toString())%></td>
+            </tr>
 <%
       zz++;
     }
 %>
-    </table>
-    <table class="reportfootertable">
-        <tr class="reportfooterrow">
-      <td class="reportfootercell">
-        <nobr>
+          </table>
+          <table class="reportfootertable">
+            <tr class="reportfooterrow">
+              <td class="reportfootercell">
+                <nobr>
 <%
     if (startRow == 0)
     {
 %>
-          <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%>
+                  <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%>
 <%
     }
     else
     {
 %>
-          <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a>
+                  <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a>
 <%
     }
 %>
-        </nobr>
-        <nobr>
+                </nobr>
+                <nobr>
 <%
     if (hasMoreRows == false)
     {
 %>
-          <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%>
+                  <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%>
 <%
     }
     else
     {
 %>
-          <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a>
+                  <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a>
 <%
     }
 %>
-        </nobr>
-      </td>
-      <td class="reportfootercell">
-        <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Rows")%></nobr>
-        <nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
-      </td>
-      <td class="reportfootercell">
-        <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%></nobr>
-        <nobr><input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/></nobr>
-      </td>
-        </tr>
-    </table>
+                </nobr>
+              </td>
+              <td class="reportfootercell">
+                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Rows")%></nobr>
+                <nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
+              </td>
+              <td class="reportfootercell">
+                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%></nobr>
+                <nobr><input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/></nobr>
+              </td>
+            </tr>
+          </table>
 
 <%
   }
   else
   {
 %>
-    <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%></td></tr></table>
+          <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%></td></tr></table>
 <%
   }
 %>
-  </form>
+        </form>
 <%
 }
-else
+catch (ManifoldCFException e)
 {
+  e.printStackTrace();
+  variableContext.setParameter("text",e.getMessage());
+  variableContext.setParameter("target","index.jsp");
 %>
-    <table class="displaytable">
-      <tr><td class="separator" colspan="1"><hr/></td></tr>
-      <tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseTryAgainLater")%></td></tr>
-    </table>
+  <jsp:forward page="error.jsp"/>
 <%
 }
 %>
-       </td>
-      </tr>
-    </table>
+      </td>
+    </tr>
+  </table>
 
 </body>
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1689231&r1=1689230&r2=1689231&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Sun Jul  5 10:17:59 2015
@@ -20,8 +20,32 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
+%>
 
+<%
+try
+{
+  // Check if authorized
+  if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_RUN_JOBS))
+  {
+    variableContext.setParameter("target","index.jsp");
+%>
+    <jsp:forward page="unauthorized.jsp"/>
+<%
+  }
+
+  if (org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway())
+  {
+%>
+    <jsp:forward page="maintenanceunderway.jsp"/>
+<%
+  }
+  
+  // Get the max count
+  int maxCount = LockManagerFactory.getIntProperty(threadContext,"org.apache.manifoldcf.ui.maxstatuscount",500000);
+  // Get the job manager handle
+  IJobManager manager = JobManagerFactory.make(threadContext);
+  JobStatus[] jobs = manager.getAllStatus(true,maxCount);
 %>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -35,54 +59,54 @@ boolean maintenanceUnderway = org.apache
   <script type="text/javascript">
   <!--
 
-  function Start(jobID)
-  {
-    document.liststatuses.op.value="Start";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function Start(jobID)
+{
+  document.liststatuses.op.value="Start";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
-  function StartMinimal(jobID)
-  {
-    document.liststatuses.op.value="StartMinimal";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function StartMinimal(jobID)
+{
+  document.liststatuses.op.value="StartMinimal";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
-  function Abort(jobID)
-  {
-    document.liststatuses.op.value="Abort";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function Abort(jobID)
+{
+  document.liststatuses.op.value="Abort";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
-  function Restart(jobID)
-  {
-    document.liststatuses.op.value="Restart";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function Restart(jobID)
+{
+  document.liststatuses.op.value="Restart";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
-  function RestartMinimal(jobID)
-  {
-    document.liststatuses.op.value="RestartMinimal";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function RestartMinimal(jobID)
+{
+  document.liststatuses.op.value="RestartMinimal";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
-  function Pause(jobID)
-  {
-    document.liststatuses.op.value="Pause";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function Pause(jobID)
+{
+  document.liststatuses.op.value="Pause";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
-  function Resume(jobID)
-  {
-    document.liststatuses.op.value="Resume";
-    document.liststatuses.jobid.value=jobID;
-    document.liststatuses.submit();
-  }
+function Resume(jobID)
+{
+  document.liststatuses.op.value="Resume";
+  document.liststatuses.jobid.value=jobID;
+  document.liststatuses.submit();
+}
 
   //-->
   </script>
@@ -91,36 +115,24 @@ boolean maintenanceUnderway = org.apache
 
 <body class="standardbody">
 
-    <table class="page">
-      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
-      <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
-       <td class="window">
-  <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%></p>
-<%
-if (maintenanceUnderway == false)
-{
-%>
-  <form class="standardform" name="liststatuses" action="execute.jsp" method="POST">
-    <input type="hidden" name="op" value="Continue"/>
-    <input type="hidden" name="type" value="jobstatus"/>
-    <input type="hidden" name="jobid" value=""/>
-
-<%
-    try
-    {
-  // Get the max count
-  int maxCount = LockManagerFactory.getIntProperty(threadContext,"org.apache.manifoldcf.ui.maxstatuscount",500000);
-  // Get the job manager handle
-  IJobManager manager = JobManagerFactory.make(threadContext);
-  JobStatus[] jobs = manager.getAllStatus(true,maxCount);
-%>
-    <table class="datatable">
-      <tr>
-        <td class="separator" colspan="8"><hr/></td>
-      </tr>
-      <tr class="headerrow">
-        <td class="columnheader"></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td>
-      </tr>
+  <table class="page">
+    <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
+    <tr>
+      <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
+      <td class="window">
+        <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%></p>
+        <form class="standardform" name="liststatuses" action="execute.jsp" method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="jobstatus"/>
+          <input type="hidden" name="jobid" value=""/>
+
+          <table class="datatable">
+            <tr>
+              <td class="separator" colspan="8"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td>
+            </tr>
 <%
   int i = 0;
   while (i < jobs.length)
@@ -198,17 +210,17 @@ if (maintenanceUnderway == false)
         endTime = new Date(js.getEndTime()).toString();
     }
 %>
-    <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
-      <td class="columncell">
-        <nobr>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
 <%
     if (status == JobStatus.JOBSTATUS_NOTYETRUN ||
       status == JobStatus.JOBSTATUS_COMPLETED ||
       status == JobStatus.JOBSTATUS_ERROR)
     {
 %>
-          <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
-          <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
+                  <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
+                  <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -218,8 +230,8 @@ if (maintenanceUnderway == false)
       status == JobStatus.JOBSTATUS_STARTING)
     {
 %>
-          <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
-          <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
+                  <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
+                  <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -227,7 +239,7 @@ if (maintenanceUnderway == false)
       status == JobStatus.JOBSTATUS_WINDOWWAIT)
     {
 %>
-          <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
+                  <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -240,58 +252,49 @@ if (maintenanceUnderway == false)
       status == JobStatus.JOBSTATUS_RESTARTING)
     {
 %>
-          <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
+                  <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_PAUSED)
     {
 %>
-          <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
+                  <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
 <%
     }
 %>
-        </nobr>
-      </td>
-      <td class="columncell"><%="<!--jobid="+js.getJobID()+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td><td class="columncell"><%=statusName%></td><td class="columncell"><%=startTime%></td><td class="columncell"><%=endTime%></td>
-      <td class="columncell"><%=(js.getQueueCountExact()?"":"&gt; ")%><%=new Long(js.getDocumentsInQueue()).toString()%></td>
-      <td class="columncell"><%=(js.getOutstandingCountExact()?"":"&gt; ")%><%=new Long(js.getDocumentsOutstanding()).toString()%></td>
-      <td class="columncell"><%=(js.getProcessedCountExact()?"":"&gt; ")%><%=new Long(js.getDocumentsProcessed()).toString()%></td>
-    </tr>
+                </nobr>
+              </td>
+              <td class="columncell"><%="<!--jobid="+js.getJobID()+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td><td class="columncell"><%=statusName%></td><td class="columncell"><%=startTime%></td><td class="columncell"><%=endTime%></td>
+              <td class="columncell"><%=(js.getQueueCountExact()?"":"&gt; ")%><%=new Long(js.getDocumentsInQueue()).toString()%></td>
+              <td class="columncell"><%=(js.getOutstandingCountExact()?"":"&gt; ")%><%=new Long(js.getDocumentsOutstanding()).toString()%></td>
+              <td class="columncell"><%=(js.getProcessedCountExact()?"":"&gt; ")%><%=new Long(js.getDocumentsProcessed()).toString()%></td>
+            </tr>
 <%
   }
 %>
 
-      <tr>
-        <td class="separator" colspan="8"><hr/></td>
-      </tr>
-    <tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr>
-    </table>
+            <tr>
+              <td class="separator" colspan="8"><hr/></td>
+            </tr>
+            <tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr>
+          </table>
 
 <%
-    }
-    catch (ManifoldCFException e)
-    {
-  out.println("Error: "+e.getMessage());
-
-  e.printStackTrace();
-    }
-%>
-      </form>
-<%
 }
-else
+catch (ManifoldCFException e)
 {
+  e.printStackTrace();
+  variableContext.setParameter("text",e.getMessage());
+  variableContext.setParameter("target","index.jsp");
 %>
-    <table class="displaytable">
-      <tr><td class="separator" colspan="1"><hr/></td></tr>
-      <tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.PleaseTryAgainLater")%></td></tr>
-    </table>
+  <jsp:forward page="error.jsp"/>
 <%
 }
 %>
-       </td>
-      </tr>
-    </table>
+        </form>
+      </td>
+    </tr>
+  </table>
 
 
 </body>



Mime
View raw message