From: Natasha Sherstneva <n.shertneva@gmail.com>
Date: Thu, 21 Nov 2013 09:35:40 +0000 (+0000)
Subject: Change structure of CFMerge branch 'servlets' of https://source.jalview.org/git/prote... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=04071a134698418246d6d75e160e1a9229b20d94;hp=-c;p=proteocache.git

Change structure of CFMerge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets
---

04071a134698418246d6d75e160e1a9229b20d94
diff --combined datadb/compbio/cassandra/CassandraWriter.java
index 99f0161,41ce8ba..640079f
--- a/datadb/compbio/cassandra/CassandraWriter.java
+++ b/datadb/compbio/cassandra/CassandraWriter.java
@@@ -11,6 -11,7 +11,7 @@@ import com.datastax.driver.core.Row
  import com.datastax.driver.core.Session;
  import com.datastax.driver.core.ResultSet;
  
+ import compbio.data.sequence.FastaSequence;
  import compbio.engine.JpredJob;
  import compbio.engine.ProteoCachePropertyHelperManager;
  import compbio.util.PropertyHelper;
@@@ -94,6 -95,7 +95,6 @@@ public class CassandraWriter 
  						+ job.getStartingDate() + ",'" + id
  						+ "'," + job.getExecutionTime() + ",'" + ip + "', '" +  finalstatus + "');";
  				session.execute(com5);
 -				System.out.println(com5);
  				if (finalstatus.equals("TIMEDOUT"))
  					njobsTimeOut = 1;
  				else if (finalstatus.equals("JPREDERROR"))
@@@ -129,6 -131,7 +130,6 @@@
  			}
  			String com = "INSERT INTO JobDateInfo " + "(jobday, Total, TotalOK, TotalStopped, TotalError, TotalTimeOut)" + " VALUES ("
  					+ job.getStartingDate() + "," + njobs + "," + njobsOk + "," + njobsStop + "," + njobsError + "," + njobsTimeOut + ");";
 -			System.out.println(com);
  			session.execute(com);
  			return 1;
  		}