* executable does not exists for a server platform\r
*/\r
@SuppressWarnings("unchecked")\r
- private <T> boolean checkService(JABAService wservice) {\r
+ private <T> boolean checkService(JABAService wservice, Services service) {\r
try {\r
if (wservice == null) {\r
throw new NullPointerException(\r
if (wservice instanceof MsaWS) {\r
return testMsaWS((MsaWS<T>) wservice);\r
} else if (wservice instanceof SequenceAnnotation) {\r
- return testSequenceAnnotationWS((SequenceAnnotation<T>) wservice);\r
+ return testSequenceAnnotationWS(\r
+ (SequenceAnnotation<T>) wservice, service);\r
} else {\r
throw new UnsupportedOperationException("The service: "\r
+ wservice.getClass() + " is not supported! ");\r
}\r
}\r
\r
- private <T> boolean testSequenceAnnotationWS(SequenceAnnotation<T> wservice)\r
- throws Exception {\r
+ private <T> boolean testSequenceAnnotationWS(\r
+ SequenceAnnotation<T> wservice, Services service) throws Exception {\r
writer.print("Calling analyse.........");\r
- boolean success = testDefaultAnalyse(loadAlignment(), wservice, null,\r
- null);\r
+\r
+ List<FastaSequence> input = loadSeqs();\r
+ if (service == Services.AAConWS) {\r
+ input = loadAlignment();\r
+ }\r
+ boolean success = testDefaultAnalyse(input, wservice, null, null);\r
\r
PresetManager<T> presetman = wservice.getPresets();\r
if (presetman != null) {\r
if (presets != null && !presets.isEmpty()) {\r
Preset<T> preset = presets.get(0);\r
writer.print("Calling analyse with Preset.........");\r
- success = testDefaultAnalyse(loadAlignment(), wservice, preset,\r
- null);\r
+ success = testDefaultAnalyse(input, wservice, preset, null);\r
}\r
}\r
testMetadata(wservice);\r
LimitsManager<T> limits = msaws.getLimits();\r
if (limits != null && limits.getLimits().size() > 0) {\r
writer.println(OK);\r
+ // writer.println("Limits details: \n" + limits.toString());\r
} else {\r
writer.println(UNSUPPORTED);\r
}\r
boolean succeed = false;\r
try {\r
writer.println("Checking service " + service.toString());\r
- succeed = checkService(ws);\r
+ succeed = checkService(ws, service);\r
} finally {\r
FileUtil.closeSilently(((Closeable) ws));\r
}\r