git://source.jalview.org
/
proteocache.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f4c4c18
..
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)) {
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();
return null;
}
SetDateRange();
@@
-109,7
+109,6
@@
public class CassandraRequester {
DataBase db = new DataBase();
db.setTimeTotalExec(totalTime);
query.add(db);
DataBase db = new DataBase();
db.setTimeTotalExec(totalTime);
query.add(db);
- System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
return query;
}
return query;
}
@@
-124,7
+123,7
@@
public class CassandraRequester {
date1 = "2100/1/1";
}
if (!isThisDateValid(date1, formatYYMMDD) || !isThisDateValid(date2, formatYYMMDD)) {
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();
return null;
}
SetDateRange();
@@
-155,7
+154,6
@@
public class CassandraRequester {
bean.setDate(DateFormat(date.getTime()));
query.add(bean);
}
bean.setDate(DateFormat(date.getTime()));
query.add(bean);
}
- System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
return query;
}
return query;
}
@@
-163,17
+161,15
@@
public class CassandraRequester {
* query: jobs and sequence at date
*/
public List<DataBase> readJobByDay (String date) {
* 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)) {
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);
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);
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);
}
bean.setProt(entry.getElement1());
query.add(bean);
}
- System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
return query;
}
return query;
}
@@
-277,20
+272,16
@@
public class CassandraRequester {
if (ip == null)
return null;
List<Pair<String, String>> res = db.ReadIpWithJobs(ip);
if (ip == null)
return null;
List<Pair<String, String>> res = db.ReadIpWithJobs(ip);
- // System.out.println(res.size());
if (res == null)
return null;
query = new ArrayList<DataBase>();
if (res == null)
return null;
query = new ArrayList<DataBase>();
- for (Pair<String, String> entry : res) {
- System.out.println("ip " + ip);
- System.out.println("id " + entry.getElement0());
+ for (Pair<String, String> entry : res) {
DataBase bean = new DataBase();
bean.setIp(ip);
bean.setId(entry.getElement0());
bean.setProt(entry.getElement1());
query.add(bean);
}
DataBase bean = new DataBase();
bean.setIp(ip);
bean.setId(entry.getElement0());
bean.setProt(entry.getElement1());
query.add(bean);
}
- System.out.println(query.size());
return query;
}
return query;
}
@@
-344,13
+335,11
@@
public class CassandraRequester {
if (0 == earlestDate) {
CassandraRequester cr = new CassandraRequester();
earlestDate = cr.earliestDate();
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("")) {
}
}
public boolean isThisDateValid(String dateToValidate, SimpleDateFormat sdf) {
if (dateToValidate == null || dateToValidate.equals("")) {
- System.out.println("Undefined date");
return false;
}
try {
return false;
}
try {