X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FCassandraNewTableWriter.java;h=c82cd63237e196ddcd930d6c9da8a5418ed2fd1d;hb=5e76924c64903dd27013651144b1b7e2fcfc7c27;hp=0d68b1acfcf40bb73437c08b25a4d071bf3c3e9a;hpb=a50f42d93e78720fa041a520f7cf73027daa7b7f;p=proteocache.git

diff --git a/datadb/compbio/cassandra/CassandraNewTableWriter.java b/datadb/compbio/cassandra/CassandraNewTableWriter.java
index 0d68b1a..c82cd63 100644
--- a/datadb/compbio/cassandra/CassandraNewTableWriter.java
+++ b/datadb/compbio/cassandra/CassandraNewTableWriter.java
@@ -2,17 +2,15 @@ package compbio.cassandra;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.exceptions.QueryExecutionException;
 
-import compbio.engine.ProteoCachePropertyHelperManager;
 import compbio.cassandra.CassandraNativeConnector;
 
 public class CassandraNewTableWriter {
@@ -46,9 +44,11 @@ public class CassandraNewTableWriter {
 	}
 
 	/*
-	 * fill new table
+	 * update programme name and version
 	 */
-	public void FillNewTable() {
+	public void FillNewParameter() {
+		System.out.println("Updating....");
+
 		final long StartTime = System.currentTimeMillis();
 		long erldate = CassandraNativeConnector.getEarliestDateInDB();
 		Calendar runnicCal = Calendar.getInstance();
@@ -57,14 +57,24 @@ public class CassandraNewTableWriter {
 		long endTime = endcal.getTime().getTime();
 		for (Date date = runnicCal.getTime(); date.getTime() < endTime; runnicCal.add(Calendar.DATE, 1), date = runnicCal.getTime()) {
 			try {
-				ResultSet results = session.execute("SELECT * FROM ProteinData WHERE jobtime = " + date.getTime() + ";");
-				session.execute("INSERT INTO JobDateInfo " + "(jobday, Total)" + " VALUES (" + date.getTime() + "," + results.all().size()
-						+ ");");
+				String com = "SELECT JobID, Protein FROM ProteinData WHERE jobtime = " + date.getTime() + ";";
+				System.out.println(com);
+				ResultSet results = session.execute(com);
+				if (results == null || results.isExhausted())
+					continue;
+				List<Row> rows = results.all();
+				System.out.println(rows.size());
+				for (Row r : rows) {
+					session.execute("UPDATE  ProteinLog SET ProgramName = 'Jpred', ProgramVersion = '3.0.1' WHERE JobID = '"
+							+ r.getString("JobID") + "';");
+					session.execute("UPDATE  JpredArchive SET ProgramName = 'Jpred', ProgramVersion = '3.0.1' WHERE JobID = '"
+							+ r.getString("JobID") + "';");
+				}
 			} catch (QueryExecutionException e) {
 				e.printStackTrace();
 			}
 		}
-		System.out.println("Table JobDateInfo filled: total time is " + (System.currentTimeMillis() - StartTime) + " msec");
+		System.out.println("Table ProteinLog filled: total time is " + (System.currentTimeMillis() - StartTime) + " msec");
 	}
 
 	/*
@@ -92,4 +102,6 @@ public class CassandraNewTableWriter {
 		Date gaga = new Date(newearliestday);
 		System.out.println("New EarliestJobDate is " + gaga.toString());
 	}
+	public void FillNewTable() {
+	}
 }