Merge branch 'DAO'

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

diff --git a/datadb/compbio/cassandra/CassandraNativeConnector.java b/datadb/compbio/cassandra/CassandraNativeConnector.java
index 3360ad1..f02000c 100644 (file)
--- a/datadb/compbio/cassandra/CassandraNativeConnector.java
+++ b/datadb/compbio/cassandra/CassandraNativeConnector.java
@@ -88,8 +88,11 @@ public class CassandraNativeConnector {
                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));");
 
-               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("CREATE TABLE IF NOT EXISTS Programs "
+                               + "(Program varchar, Version varchar, Description varchar, weblink varchar, PRIMARY KEY(Program,Version));");
+
+               session.execute("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 ProgramName ascii;");
                // session.execute("ALTER TABLE ProteinLog ADD ProgramVersion ascii;");
@@ -115,7 +118,6 @@ public class CassandraNativeConnector {
         */
        public static long getEarliestDateInDB() {
                String com = "SELECT * FROM MainParameters WHERE Name = 'EarliestJobDate';";
-               System.out.println("Command: " + com);
                ResultSet results = session.execute(com);
 
                if (!results.isExhausted()) {