import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import compbio.cassandra.JpredParser;
import compbio.data.sequence.FastaReader;
return protein;
}
- private String parseLogFile(final InputStream stream) throws IOException {
+ private String parseLogFile(final InputStream stream, JpredJob job) throws IOException {
String out = "";
BufferedReader buffer = new BufferedReader(new InputStreamReader(stream));
String line;
+ if (null != (out = buffer.readLine()) && (out.contains("version"))) {
+ Matcher matcher = Pattern.compile("((\\d|\\.)+)").matcher(out);
+ if (matcher.find())
+ job.setVersion(matcher.group(0));
+ }
while (null != (line = buffer.readLine())) {
- out += line;
+ out += line;
}
return out;
}
if (199 < httpConnection_conciseurl.getResponseCode() && httpConnection_conciseurl.getResponseCode() < 300) {
ConcisefileExists = true;
running = false;
- try {
+ try {
job.setProtein(parsePredictions(conciseurl.openStream(), job.getJobID()));
} catch (IOException e) {
e.printStackTrace();
}
if (199 < httpConnection_logurl.getResponseCode() && httpConnection_logurl.getResponseCode() < 300) {
LogfileExists = true;
- job.setLog(parseLogFile(logurl.openStream()));
+ job.setProgrammeName("Jpred");
+ job.setLog(parseLogFile(logurl.openStream(), job));
} else {
// The job has not been started at all...
job.setExecutionStatus("FAIL");