X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FCassandraNativeConnector.java;h=3360ad1dc201e70971f5bec8dc474477ae61fe66;hb=5fb4cb600b34a9b33e1a96aae9d66cdd1c3201dc;hp=beb83c4bce42682248840cc48d87a9fbebf28637;hpb=db09514e58b52d44ef52d7c4591924a762c99c4b;p=proteocache.git

diff --git a/datadb/compbio/cassandra/CassandraNativeConnector.java b/datadb/compbio/cassandra/CassandraNativeConnector.java
index beb83c4..3360ad1 100644
--- a/datadb/compbio/cassandra/CassandraNativeConnector.java
+++ b/datadb/compbio/cassandra/CassandraNativeConnector.java
@@ -73,7 +73,7 @@ public class CassandraNativeConnector {
 
 		session.execute("CREATE TABLE IF NOT EXISTS ProteinLog "
 				+ "(JobID ascii, DataBegin ascii, DataEnd ascii, ip ascii, FinalStatus ascii, "
-				+ "ExecutionStatus ascii, Protein ascii, ProgrammeName ascii, Version ascii, PRIMARY KEY(JobID));");
+				+ "ExecutionStatus ascii, Protein ascii, ProgramName ascii, ProgramVersion ascii, PRIMARY KEY(JobID));");
 
 		session.execute("CREATE TABLE IF NOT EXISTS ProteinData "
 				+ "(jobtime bigint, JobID ascii, ExecTime int, Protein ascii, PRIMARY KEY(jobtime, JobID));");
@@ -83,7 +83,7 @@ public class CassandraNativeConnector {
 
 		session.execute("CREATE TABLE IF NOT EXISTS JpredArchive "
 				+ "(JobID ascii, Protein varchar, IP ascii, StartTime bigint, ExecTime int, FinalStatus ascii, ExecutionStatus ascii, alignment map<ascii,ascii>, "
-				+ "predictions map<ascii,ascii>, ArchiveLink varchar, LOG varchar, ProgrammeName ascii, Version ascii, PRIMARY KEY(JobID));");
+				+ "predictions map<ascii,ascii>, ArchiveLink varchar, LOG varchar, ProgramName ascii, ProgramVersion ascii, PRIMARY KEY(JobID));");
 
 		session.execute("CREATE TABLE IF NOT EXISTS JobDateInfo "
 				+ "(jobday bigint, Total bigint,  TotalOK bigint, TotalStopped bigint, TotalError bigint, TotalTimeOut bigint, Program varchar, Version varchar, PRIMARY KEY(jobday));");
@@ -91,13 +91,11 @@ public class CassandraNativeConnector {
 		String com = "CREATE TABLE IF NOT EXISTS Users "
 				+ "(name varchar, id bigint, email varchar, password varchar, organisation varchar, position varchar, signedtolist boolean, registrationdate bigint, PRIMARY KEY(id));";
 
-		
-	
-	//	session.execute("ALTER TABLE ProteinLog ADD ProgrammeName ascii;");
-	//	session.execute("ALTER TABLE ProteinLog ADD Version ascii;");
-	//	session.execute("ALTER TABLE JpredArchive ADD ProgrammeName ascii;");
-	//	session.execute("ALTER TABLE JpredArchive ADD Version ascii;");
-		
+		// session.execute("ALTER TABLE ProteinLog ADD ProgramName ascii;");
+		// session.execute("ALTER TABLE ProteinLog ADD ProgramVersion ascii;");
+		// session.execute("ALTER TABLE JpredArchive ADD ProgramName ascii;");
+		// session.execute("ALTER TABLE JpredArchive ADD ProgramVersion ascii;");
+
 		session.execute("CREATE INDEX IF NOT EXISTS ProteinSeq ON ProteinRow (protein);");
 		session.execute("CREATE INDEX IF NOT EXISTS ProteinIp ON ProteinLog (ip);");
 		session.execute("CREATE INDEX IF NOT EXISTS ON ProteinLog (ExecutionStatus);");