X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FJpredParserHTTP.java;h=1d888e45404c8e9e5d5eb3286c9a751c01e9cfd4;hb=db09514e58b52d44ef52d7c4591924a762c99c4b;hp=d221209a7962142ce309b70f67dc1df68cdf003c;hpb=006363dc999cef4e9c49dd6a38ea0d78cbb62472;p=proteocache.git

diff --git a/datadb/compbio/cassandra/JpredParserHTTP.java b/datadb/compbio/cassandra/JpredParserHTTP.java
index d221209..1d888e4 100644
--- a/datadb/compbio/cassandra/JpredParserHTTP.java
+++ b/datadb/compbio/cassandra/JpredParserHTTP.java
@@ -13,6 +13,8 @@ import java.util.ArrayList;
 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;
@@ -106,12 +108,17 @@ public class JpredParserHTTP implements JpredParser {
 		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;
 	}
@@ -140,7 +147,7 @@ public class JpredParserHTTP implements JpredParser {
 			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();
@@ -151,7 +158,8 @@ public class JpredParserHTTP implements JpredParser {
 			}
 			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");