A bug fix, help text for stat jsp pages and style improvements

[jabaws.git] / webservices / compbio / stat / collector / ExecutionStatCollector.java

diff --git a/webservices/compbio/stat/collector/ExecutionStatCollector.java b/webservices/compbio/stat/collector/ExecutionStatCollector.java
index 31a5747..785f659 100644 (file)
--- a/webservices/compbio/stat/collector/ExecutionStatCollector.java
+++ b/webservices/compbio/stat/collector/ExecutionStatCollector.java
@@ -260,8 +260,20 @@ public class ExecutionStatCollector implements Runnable {
                        return UNDEFINED;\r
                }\r
 \r
+               /*\r
+                * TODO unify input!\r
+                */\r
                long getInputSize() {\r
-                       File input = files.get("fasta.in");\r
+                       Class<? extends Executable<?>> name = Services\r
+                                       .getRunnerByJobDirectory(jobdir);\r
+\r
+                       File input = null;\r
+                       if (name.getSimpleName().equalsIgnoreCase("ClustalW")) {\r
+                               input = files.get("input.txt");\r
+                       } else {\r
+                               input = files.get("fasta.in");\r
+                       }\r
+\r
                        if (input != null) {\r
                                return input.length();\r
                        }\r
@@ -321,6 +333,7 @@ public class ExecutionStatCollector implements Runnable {
        @Override\r
        public void run() {\r
                log.info("Started updating statistics at " + new Date());\r
+               log.info("For directory: " + workDirectory.getAbsolutePath());\r
 \r
                collectStatistics();\r
 \r