Author: kwright
Date: Tue Mar 5 09:12:33 2013
New Revision: 1452702
URL: http://svn.apache.org/r1452702
Log:
Fix broken reports, as a result of refactoring done during CONNECTORS-63 work.
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1452702&r1=1452701&r2=1452702&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
Tue Mar 5 09:12:33 2013
@@ -346,6 +346,22 @@ if (maintenanceUnderway == false)
activityList =
org.apache.manifoldcf.crawler.system.ManifoldCF.getActivitiesList(threadContext,reportConnection);
if (activityList == null)
reportConnection = "";
+ else
+ {
+ selectedActivities = new HashMap();
+ String[] activitiesToNote;
+ int j = 0;
+ if (reportActivities == null)
+ activitiesToNote = activityList;
+ else
+ activitiesToNote = reportActivities;
+
+ while (j < activitiesToNote.length)
+ {
+ String activity = activitiesToNote[j++];
+ selectedActivities.put(activity,activity);
+ }
+ }
}
%>
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1452702&r1=1452701&r2=1452702&view=diff
==============================================================================
---
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
(original)
+++
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
Tue Mar 5 09:12:33 2013
@@ -346,6 +346,22 @@ if (maintenanceUnderway == false)
activityList =
org.apache.manifoldcf.crawler.system.ManifoldCF.getActivitiesList(threadContext,reportConnection);
if (activityList == null)
reportConnection = "";
+ else
+ {
+ selectedActivities = new HashMap();
+ String[] activitiesToNote;
+ int j = 0;
+ if (reportActivities == null)
+ activitiesToNote = activityList;
+ else
+ activitiesToNote = reportActivities;
+
+ while (j < activitiesToNote.length)
+ {
+ String activity = activitiesToNote[j++];
+ selectedActivities.put(activity,activity);
+ }
+ }
}
%>
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=1452702&r1=1452701&r2=1452702&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp Tue
Mar 5 09:12:33 2013
@@ -373,6 +373,22 @@ if (maintenanceUnderway == false)
activityList =
org.apache.manifoldcf.crawler.system.ManifoldCF.getActivitiesList(threadContext,reportConnection);
if (activityList == null)
reportConnection = "";
+ else
+ {
+ selectedActivities = new HashMap();
+ String[] activitiesToNote;
+ int j = 0;
+ if (reportActivities == null)
+ activitiesToNote = activityList;
+ else
+ activitiesToNote = reportActivities;
+
+ while (j < activitiesToNote.length)
+ {
+ String activity = activitiesToNote[j++];
+ selectedActivities.put(activity,activity);
+ }
+ }
}
%>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1452702&r1=1452701&r2=1452702&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp Tue
Mar 5 09:12:33 2013
@@ -301,6 +301,22 @@ if (maintenanceUnderway == false)
activityList =
org.apache.manifoldcf.crawler.system.ManifoldCF.getActivitiesList(threadContext,reportConnection);
if (activityList == null)
reportConnection = "";
+ else
+ {
+ selectedActivities = new HashMap();
+ String[] activitiesToNote;
+ int j = 0;
+ if (reportActivities == null)
+ activitiesToNote = activityList;
+ else
+ activitiesToNote = reportActivities;
+
+ while (j < activitiesToNote.length)
+ {
+ String activity = activitiesToNote[j++];
+ selectedActivities.put(activity,activity);
+ }
+ }
}
%>