Fix problem with new table column names: ProgrammeName -> ProgramName, Version -...

[proteocache.git] / datadb / compbio / cassandra / JpredParserHTTP.java

diff --git a/datadb/compbio/cassandra/JpredParserHTTP.java b/datadb/compbio/cassandra/JpredParserHTTP.java
index 1d888e4..825689e 100644 (file)
--- a/datadb/compbio/cassandra/JpredParserHTTP.java
+++ b/datadb/compbio/cassandra/JpredParserHTTP.java
@@ -115,7 +115,7 @@ public class JpredParserHTTP implements JpredParser {
                if (null != (out = buffer.readLine()) && (out.contains("version"))) {
                        Matcher matcher = Pattern.compile("((\\d|\\.)+)").matcher(out);
                        if (matcher.find())
-                               job.setVersion(matcher.group(0));
+                               job.setProgramVersion(matcher.group(0));
                }
                while (null != (line = buffer.readLine())) {
                        out += line;            
@@ -131,6 +131,7 @@ public class JpredParserHTTP implements JpredParser {
                boolean LogfileExists = false;
                JpredJob job = new JpredJob(jobinfo[jobinfo.length - 1], jobinfo[0], jobinfo[1]);
                job.setIP(jobinfo[2]);
+               job.setProgramName("Jpred");
                Date currDate = new Date();
                String maindir = dirprefix + "/" + job.getJobID() + "/";
 
@@ -158,7 +159,6 @@ public class JpredParserHTTP implements JpredParser {
                        }
                        if (199 < httpConnection_logurl.getResponseCode() && httpConnection_logurl.getResponseCode() < 300) {
                                LogfileExists = true;
-                               job.setProgrammeName("Jpred");
                                job.setLog(parseLogFile(logurl.openStream(), job));
                        } else {
                                // The job has not been started at all...