Add mode comments to the classes

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

diff --git a/datadb/compbio/cassandra/CassandraNativeConnector.java b/datadb/compbio/cassandra/CassandraNativeConnector.java
index 3360ad1..6b63a57 100644 (file)
--- a/datadb/compbio/cassandra/CassandraNativeConnector.java
+++ b/datadb/compbio/cassandra/CassandraNativeConnector.java
@@ -37,7 +37,7 @@ public class CassandraNativeConnector {
                return session;
        }
 
-       /*
+       /**
         * connect to the cluster and look whether all tables exist
         */
        public void Connect() {
@@ -86,10 +86,13 @@ public class CassandraNativeConnector {
                                + "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));");
+                               + "(jobday bigint, TotalOK bigint, TotalStopped bigint, TotalError bigint, TotalTimeOut bigint, PRIMARY KEY(jobday));");
+
+               session.execute("CREATE TABLE IF NOT EXISTS Programs "
+                               + "(Program varchar, Version varchar, Description varchar, weblink varchar, PRIMARY KEY(Program,Version));");
 
-               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 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()) {