Remove system prints

[proteocache.git] / server / compbio / statistic / CassandraRequester.java

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 72ec074..0494a83 100755 (executable)
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -35,7 +35,7 @@ public class CassandraRequester {
                        date1 = "2100/1/1";
                }
                if (!isThisDateValid(date1,formatYYMMDD) || !isThisDateValid(date2,formatYYMMDD)) {
-                       System.out.println("Wrong date: point 3");
+                       System.out.println("CassandraRequester.extractExecutionTime: wrong format for date1 " + date1 + "or date2 " + date2);
                        return null;
                }
                SetDateRange();
@@ -109,7 +109,6 @@ public class CassandraRequester {
                DataBase db = new DataBase();
                db.setTimeTotalExec(totalTime);
                query.add(db);
-               System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
                return query;
        }
        
@@ -124,7 +123,7 @@ public class CassandraRequester {
                        date1 = "2100/1/1";
                }
                if (!isThisDateValid(date1, formatYYMMDD) || !isThisDateValid(date2, formatYYMMDD)) {
-                       System.out.println("Wrong date: point 3");
+                       System.out.println("CassandraRequester.countJobs: wrong format for date1 " + date1 + "or date2 " + date2);
                        return null;
                }
                SetDateRange();
@@ -155,7 +154,6 @@ public class CassandraRequester {
                        bean.setDate(DateFormat(date.getTime()));
                        query.add(bean);
                }
-               System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
                return query;
        }
 
@@ -163,17 +161,15 @@ public class CassandraRequester {
         * query: jobs and sequence at date
         */
        public List<DataBase> readJobByDay (String date) {
-               System.out.println(date);
                if (null == date) {
                        return null;
                }
                if (!isThisDateValid(date, formatDDMMYY)) {
-                       System.out.println("Wrong date: point 3");
+                       System.out.println("CassandraRequester.readJobByDay: Wrong date format for " + date);
                        return null;
                }
                SetDateRange();
                long day = DateParsing(date, formatDDMMYY);
-               System.out.println(day);
                if (day < earlestDate || day > currentDate)
                        return null;    
                List<Pair<String, String>>      res = db.ReadProteinData(day);
@@ -187,7 +183,6 @@ public class CassandraRequester {
                        bean.setProt(entry.getElement1());
                        query.add(bean);
                }
-               System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
                return query;
        }
 
@@ -235,6 +230,26 @@ public class CassandraRequester {
                return query;
        }
        
+       /* 
+        * query ip with number of jobs
+        */
+       public List<DataBase> readIpByCounter(Integer minimalcounter) {
+               query = new ArrayList<DataBase>();
+               Map<String, Integer> map = db.ReadIpByCounter();
+               if (minimalcounter == null)
+                       minimalcounter = 0;
+               if (map == null)
+                       return null;
+               for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                       if (entry.getValue() > minimalcounter) {
+                               DataBase bean = new DataBase();
+                               bean.setTotalId(entry.getValue());
+                               bean.setIp(entry.getKey());
+                               query.add(bean);
+                       }
+               }
+               return query;
+       }
        /*
         * query jobs log info
         */
@@ -249,6 +264,27 @@ public class CassandraRequester {
                return query;
        }
        
+       
+       /*
+        * query jobs by ipStructureJobLog
+        */
+       public List<DataBase> readIp(String ip) {
+               if (ip == null)
+                       return null;
+               List<Pair<String, String>> res = db.ReadIpWithJobs(ip);
+               if (res == null) 
+                       return null;
+               query = new ArrayList<DataBase>();
+               for (Pair<String, String> entry : res) {
+                       DataBase bean = new DataBase();
+                       bean.setIp(ip);
+                       bean.setId(entry.getElement0());
+                       bean.setProt(entry.getElement1());
+                       query.add(bean);
+               }
+               return query;
+       }
+       
        /*
         * create list of parts of protein sequence;
         */
@@ -299,13 +335,11 @@ public class CassandraRequester {
                if (0 == earlestDate) {
                        CassandraRequester cr = new CassandraRequester();
                        earlestDate = cr.earliestDate();
-                       System.out.println("Set earlest Date = " + earlestDate);
                }
        }
 
        public boolean isThisDateValid(String dateToValidate, SimpleDateFormat sdf) {
                if (dateToValidate == null || dateToValidate.equals("")) {
-                       System.out.println("Undefined date");
                        return false;
                }
                try {