From: Natasha Sherstneva Date: Thu, 5 Dec 2013 10:00:34 +0000 (+0000) Subject: delete DataBase beans X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=027e5ff55587cf7e8295066f9e43d56c180354f6;p=proteocache.git delete DataBase beans --- diff --git a/datadb/compbio/cassandra/DataBase.java b/datadb/compbio/cassandra/DataBase.java deleted file mode 100644 index 57063ec..0000000 --- a/datadb/compbio/cassandra/DataBase.java +++ /dev/null @@ -1,163 +0,0 @@ -package compbio.cassandra; - -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; - -public class DataBase { - private String date; - private int total; // total number of jobs - private int totalOK; // number of jobs with execution status OK - private int totalStopped; // number of jobs with execution status STOPPED - private int totalError; // number of jobs with execution status Jpred ERROR - private int totalTimeOut; // number of jobs with execution status TIMEOUT - private int totalJobs; - private int totalId; // total jobs for current protein sequence - private String id; - private String ip; - private String prot; // protein sequence - private String jpred; - private List timeRez; - private List timeTotalExec; - private JobBean logInfo; - private ProteinBean predictions; - - public DataBase() { - } - - public DataBase(String dat, int total) { - this.date = dat; - this.total = total; - } - - public void setDate(String dat) { - this.date = dat; - } - - public String getDate() { - if (null == date) - return "1/1/1970"; - return date; - } - - public void setTotal(int tot) { - this.total = tot; - } - - public int getTotal() { - return total; - } - - public void setTotalOK(int tot) { - this.totalOK = tot; - } - - public int getTotalOK() { - return totalOK; - } - - public void setTotalStopped(int tot) { - this.totalStopped = tot; - } - - public int getTotalStopped() { - return totalStopped; - } - - public void setTotalError(int tot) { - this.totalError = tot; - } - - public int getTotalError() { - return totalError; - } - - public void setTotalTimeOut(int tot) { - this.totalTimeOut = tot; - } - - public int getTotalTimeOut() { - return totalTimeOut; - } - - public void setTotalJobs(int totalJobs) { - this.totalJobs = totalJobs; - } - - public int getTotalJobs() { - return totalJobs; - } - - public void setTotalId(int totId) { - this.totalId = totId; - } - - public int getTotalId() { - return totalId; - } - - public void setProt(String prot) { - this.prot = prot; - } - - public String getProt() { - return prot; - } - - public void setJpred(String jpred) { - this.jpred = jpred; - } - - public String getJpred() { - return jpred; - } - - public void setId(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getIp() { - return ip; - } - - public void setTimeRez(List timeRez) { - this.timeRez = timeRez; - } - - public List getTimeRez() { - return timeRez; - } - - public void setTimeTotalExec(List timeTotalExec) { - this.timeTotalExec = timeTotalExec; - } - - public List getTimeTotalExec() { - return timeTotalExec; - } - - public void setLogInfo(JobBean logInfo){ - this.logInfo = logInfo; - } - - public JobBean getLogInfo() { - return logInfo; - } - - public void setPredictions(ProteinBean predictions){ - this.predictions = predictions; - } - - public ProteinBean getPredictions() { - return predictions; - } - -} diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java index b735107..8bd718e 100644 --- a/server/compbio/controllers/DailyStatisticsController.java +++ b/server/compbio/controllers/DailyStatisticsController.java @@ -12,11 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import compbio.cassandra.DataBase; import compbio.cassandra.DateBean; import compbio.cassandra.TotalJobsStatisticBean; import compbio.statistic.CassandraRequester; -import compbio.statistic.StatisticsProt; /** * @author Alexander Sherstnev @@ -46,7 +44,7 @@ public class DailyStatisticsController { CassandraRequester cr = new CassandraRequester(); if (option.equals("AllDates,off")) { Calendar cal = Calendar.getInstance(); - date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate()); + date1 = cr.earliestDateString(); date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); } model.put("date1", date1); diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java index 424a742..3d5caa0 100644 --- a/server/compbio/controllers/IPDataController.java +++ b/server/compbio/controllers/IPDataController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import compbio.cassandra.DataBase; import compbio.cassandra.TotalByCounterBean; import compbio.cassandra.UserBean; import compbio.statistic.CassandraRequester; diff --git a/server/compbio/controllers/JobExecutionTimeController.java b/server/compbio/controllers/JobExecutionTimeController.java index 191a40c..13c606d 100644 --- a/server/compbio/controllers/JobExecutionTimeController.java +++ b/server/compbio/controllers/JobExecutionTimeController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import compbio.statistic.CassandraRequester; -import compbio.statistic.StatisticsProt; + /** * @author Alexander Sherstnev @@ -38,13 +38,13 @@ public class JobExecutionTimeController { CassandraRequester sp = new CassandraRequester(); if (option.equals("AllDates,off")) { Calendar cal = Calendar.getInstance(); - date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate()); - date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); +// date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate()); +// date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); } model.put("date1", date1); model.put("date2", date2); model.put("option", option); - model.put("result", sp.extractExecutionTime(date1, date2)); + // model.put("result", sp.extractExecutionTime(date1, date2)); final long endTime = System.currentTimeMillis(); model.put("timeExecution", (endTime - startTime)); return "/reportTimeExecution"; diff --git a/server/compbio/controllers/SequenceController.java b/server/compbio/controllers/SequenceController.java index 2008a06..c57ed1f 100644 --- a/server/compbio/controllers/SequenceController.java +++ b/server/compbio/controllers/SequenceController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import compbio.cassandra.ProteinBean; -import compbio.cassandra.DataBase; import compbio.cassandra.TotalByCounterBean; import compbio.statistic.CassandraRequester; diff --git a/server/compbio/listeners/DetailList.java b/server/compbio/listeners/DetailList.java deleted file mode 100644 index 385ce95..0000000 --- a/server/compbio/listeners/DetailList.java +++ /dev/null @@ -1,46 +0,0 @@ -package compbio.listeners; - -import java.io.IOException; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import compbio.cassandra.*; -import compbio.statistic.StatisticsProt; - -/** - * Servlet implementation class DetailList - */ -@WebServlet("/DetailList") -public class DetailList extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - List result; - String date1 = request.getParameter("data1"); - String date2 = request.getParameter("data2"); - StatisticsProt sp = new StatisticsProt(); - // result = sp.readDetail(date1, date2); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - } - -} diff --git a/server/compbio/listeners/ServletIp.java b/server/compbio/listeners/ServletIp.java index e229176..76c59ff 100644 --- a/server/compbio/listeners/ServletIp.java +++ b/server/compbio/listeners/ServletIp.java @@ -9,7 +9,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import compbio.cassandra.DataBase; import compbio.statistic.CassandraRequester; /** diff --git a/server/compbio/listeners/ServletJobsByDate.java b/server/compbio/listeners/ServletJobsByDate.java index 8ae389f..83b2e4d 100644 --- a/server/compbio/listeners/ServletJobsByDate.java +++ b/server/compbio/listeners/ServletJobsByDate.java @@ -11,9 +11,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import compbio.cassandra.DataBase; import compbio.statistic.CassandraRequester; -import compbio.statistic.StatisticsProt; @WebServlet("/ServletJobsByDate") public class ServletJobsByDate extends HttpServlet { @@ -30,7 +28,7 @@ public class ServletJobsByDate extends HttpServlet { CassandraRequester cr = new CassandraRequester(); if (null != request.getParameter("option")) { Calendar cal = Calendar.getInstance(); - date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate()); + // date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate()); date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); } request.setAttribute("data1", date1); diff --git a/server/compbio/listeners/ServletJobsByIp.java b/server/compbio/listeners/ServletJobsByIp.java index bff4a5c..d50ff71 100644 --- a/server/compbio/listeners/ServletJobsByIp.java +++ b/server/compbio/listeners/ServletJobsByIp.java @@ -9,7 +9,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import compbio.cassandra.DataBase; import compbio.statistic.CassandraRequester; /** diff --git a/server/compbio/listeners/ServletSequenceProtein.java b/server/compbio/listeners/ServletSequenceProtein.java index 6d1316d..8b75770 100644 --- a/server/compbio/listeners/ServletSequenceProtein.java +++ b/server/compbio/listeners/ServletSequenceProtein.java @@ -10,9 +10,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import compbio.cassandra.DataBase; import compbio.statistic.CassandraRequester; -import compbio.statistic.StatisticsProt; /** * Servlet implementation class ProtServlet diff --git a/server/compbio/listeners/ServletTimeExecution.java b/server/compbio/listeners/ServletTimeExecution.java index c380604..563cf42 100644 --- a/server/compbio/listeners/ServletTimeExecution.java +++ b/server/compbio/listeners/ServletTimeExecution.java @@ -10,7 +10,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import compbio.statistic.StatisticsProt; import compbio.statistic.CassandraRequester; /** @@ -31,12 +30,12 @@ public class ServletTimeExecution extends HttpServlet { CassandraRequester sp = new CassandraRequester(); if (null != request.getParameter("option")) { Calendar cal = Calendar.getInstance(); - date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate()); + // date1 = CassandraRequester.DateFormatYYMMDD(sp.earliestDate()); date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); } request.setAttribute("data1", date1); request.setAttribute("data2", date2); - request.setAttribute("result", sp.extractExecutionTime(date1, date2)); + // request.setAttribute("result", sp.extractExecutionTime(date1, date2)); request.setAttribute("flag", request.getParameter("option")); final long endTime = System.currentTimeMillis(); request.setAttribute("timeExecution", (endTime - startTime)); diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java index c150d9d..5de5066 100755 --- a/server/compbio/statistic/CassandraRequester.java +++ b/server/compbio/statistic/CassandraRequester.java @@ -13,7 +13,6 @@ import compbio.cassandra.DateBean; import compbio.cassandra.ProteinBean; import compbio.cassandra.CassandraNativeConnector; import compbio.cassandra.CassandraReader; -import compbio.cassandra.DataBase; import compbio.cassandra.Pair; import compbio.cassandra.JobBean; import compbio.cassandra.Total; @@ -23,7 +22,6 @@ import compbio.cassandra.UserBean; public class CassandraRequester { private CassandraReader db = new CassandraReader(); - private ArrayList query; private static long currentDate = 0; private static long earlestDate = 0; private final static SimpleDateFormat formatYYMMDD = new SimpleDateFormat("yyyy/MM/dd"); @@ -31,7 +29,7 @@ public class CassandraRequester { /* * query: execution time for the period from date1 till date2 - */ + public List extractExecutionTime(String date1, String date2) { if (null == date1) { date1 = "1970/1/1"; @@ -115,7 +113,7 @@ public class CassandraRequester { db.setTimeTotalExec(totalTime); query.add(db); return query; - } + }*/ /* * query: total number of jobs for the period from date1 till date2 @@ -301,6 +299,12 @@ public class CassandraRequester { SimpleDateFormat datformat = new SimpleDateFormat("dd/MM/yyyy"); return datformat.format(new Date(inDate)); } + + // convert long to date in string format + private static String DateFormatYYMMDD(long inDate) { + SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd"); + return datformat.format(new Date(inDate)); + } /* * set earlest date and current dates. earlestDate is static and should be @@ -338,4 +342,12 @@ public class CassandraRequester { return earlestDate; } + /* + * find the earliest date in the database in String format + */ + public String earliestDateString() { + earlestDate = CassandraNativeConnector.getEarliestDateInDB(); + return DateFormatYYMMDD(earlestDate); + } + } diff --git a/server/compbio/statistic/StatisticsProt.java b/server/compbio/statistic/StatisticsProt.java deleted file mode 100755 index 05375c0..0000000 --- a/server/compbio/statistic/StatisticsProt.java +++ /dev/null @@ -1,402 +0,0 @@ -package compbio.statistic; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import compbio.cassandra.CassandraNativeConnector; -import compbio.cassandra.DataBase; - -public class StatisticsProt { - private CassandraNativeConnector cc = new CassandraNativeConnector(); - private ArrayList query; - private static long currentDate = 0; - private static long earlestDate = 0; - - /* - * query: the period from date1 till date2 - * */ - public List readDetails(String date1, String date2) { - - if (!isThisDateValid(date1) || !isThisDateValid(date2)) { - System.out.println("Wrong date: point 1"); - return null; - } - SetDateRange(); - long dateStart = DateParsing(date1); - long dateEnd = DateParsing(date2); - if ((dateStart < earlestDate && dateEnd < earlestDate) || (dateStart > currentDate && dateEnd > currentDate) || dateStart > dateEnd) - return null; - if (dateStart < earlestDate) - dateStart = earlestDate; - if (dateEnd > currentDate) - dateStart = currentDate; - System.out.println("StatisticsProt.readDetails: earlestDate = " + earlestDate + ", currentDate = " + currentDate); - System.out.println("StatisticsProt.readDetails: Start date " + date1 + ": int representation = " + dateStart); - System.out.println("StatisticsProt.readDetails: End date " + date2 + ": int representation = " + dateEnd); - Calendar start = Calendar.getInstance(); - start.setTime(new Date(dateStart)); - Calendar end = Calendar.getInstance(); - end.setTime(new Date(dateEnd)); - query = new ArrayList(); - int day = 0; - /* - for (Date date = start.getTime(); !start.after(end); start.add(Calendar.DATE, 1), date = start.getTime()) { - SliceQuery result = HFactory.createSliceQuery(cc.GetKeyspace(), LongSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - result.setColumnFamily("ProteinData"); - result.setKey(date.getTime()); - result.setRange(null, null, false, Integer.MAX_VALUE); - QueryResult> columnSlice = result.execute(); - ++day; - System.out.print("Day " + day + ": dataStart = " + date + ": "); - if (!columnSlice.get().getColumns().isEmpty()) { - DataBase db = new DataBase(DateFormat(date.getTime()), columnSlice.get().getColumns().size()); - query.add(db); - System.out.println("data exist"); - } else { - System.out.println("no data"); - } - } - */ - System.out.println("StatisticsProt.readLength: total number of dates = " + query.size()); - return query; - } - - /* - * query: execution time for the period from date1 till date2 - * */ - public List readLength(String date1, String date2) { - if (!isThisDateValid(date1) || !isThisDateValid(date2)) { - System.out.println("Wrong date: point 3"); - return null; - } - SetDateRange(); - int nbins = 5; - long dateStart = DateParsing(date1); - long dateEnd = DateParsing(date2); - if ((dateStart < earlestDate && dateEnd < earlestDate) || (dateStart > currentDate && dateEnd > currentDate) || dateStart > dateEnd) - return null; - if (dateStart < earlestDate) - dateStart = earlestDate; - if (dateEnd > currentDate) - dateStart = currentDate; - System.out.println("StatisticsProt.readLength: earlestDate = " + earlestDate + ", currentDate = " + currentDate); - System.out.println("StatisticsProt.readLength: Start date is " + date1 + ": int representation = " + dateStart); - System.out.println("StatisticsProt.readLength: End date is " + date2 + ": int representation = " + dateEnd); - Calendar start = Calendar.getInstance(); - start.setTime(new Date(dateStart)); - Calendar end = Calendar.getInstance(); - end.setTime(new Date(dateEnd)); - query = new ArrayList(); - List totalTime = new ArrayList(); - for (int i = 0; i < nbins; i++) - totalTime.add(i, 0); - /* - for (Date date = start.getTime(); !start.after(end); start.add(Calendar.DATE, 1), date = start.getTime()) { - List timeResult = new ArrayList(); - SliceQuery result = HFactory.createSliceQuery(cc.GetKeyspace(), LongSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - result.setColumnFamily("ProteinData"); - result.setKey(date.getTime()); - result.setRange(null, null, false, Integer.MAX_VALUE); - QueryResult> columnSlice = result.execute(); - List> col = columnSlice.get().getColumns(); - if (!col.isEmpty()) { - Iterator> itCol = col.iterator(); - for (int i = 0; i < nbins; i++) - timeResult.add(i, 0); - // split all jobs into nbins bins - while (itCol.hasNext()) { - String id = itCol.next().getName(); - long lenResult = CountID(id); - if (lenResult <= 30) - timeResult.set(0, timeResult.get(0) + 1); - else if (lenResult > 30 && lenResult <= 60) - timeResult.set(1, timeResult.get(1) + 1); - else if (lenResult > 60 && lenResult <= 120) - timeResult.set(2, timeResult.get(2) + 1); - else if (lenResult > 120 && lenResult <= 600) - timeResult.set(3, timeResult.get(3) + 1); - else { - timeResult.set(4, timeResult.get(4) + 1); - } - } - for (int i = 0; i < nbins; i++) - totalTime.set(i, totalTime.get(i) + timeResult.get(i)); - DataBase db = new DataBase(); - db.setTimeRez(timeResult); - db.setDate(DateFormat(date.getTime())); - 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; - } - - /* - * query: protein sequence - * */ - public List readProteins(String protIn) { - query = new ArrayList(); - /* - SliceQuery result = HFactory.createSliceQuery(cc.GetKeyspace(), StringSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - result.setColumnFamily("ProteinRow"); - result.setKey(protIn); - result.setRange(null, null, false, Integer.MAX_VALUE); - QueryResult> columnSlice = result.execute(); - Iterator> it = columnSlice.get().getColumns().iterator(); - while (it.hasNext()) { - HColumn col = it.next(); - String name = col.getName(); - if (name.matches("(.*)jnetpred")) { - DataBase db = new DataBase(); - db.setProt(protIn); - db.setId(col.getName()); - db.setJpred(col.getValue()); - query.add(db); - } - } - */ - return query; - } - - /* - * query by a protein sequence - * */ - public List readProtID(int counter) { - query = new ArrayList(); - int row_count = 100; - /* - RangeSlicesQuery result = HFactory.createRangeSlicesQuery(cc.GetKeyspace(), StringSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - result.setColumnFamily("ProteinRow"); - result.setRange(null, null, false, 100); - result.setRowCount(row_count); - String last_key = null; - while (true) { - result.setKeys(last_key, null); - QueryResult> columnSlice = result.execute(); - OrderedRows rows = columnSlice.get(); - Iterator> rowsIterator = rows.iterator(); - while (rowsIterator.hasNext()) { - Row row = rowsIterator.next(); - last_key = row.getKey(); - List> clms = row.getColumnSlice().getColumns(); - //int npred = 0; - //for (HColumn cln : clms) { - // String name = cln.getName(); - // if (name.matches("(.*)jnetpred")) { - // ++npred; - // } - //} - int npred = clms.size(); - if (npred > counter) { - DataBase db = new DataBase(); - db.setProt(last_key); - db.setTotalId(npred); - query.add(db); - } - } - if (rows.getCount() < row_count) - break; - }*/ - return query; - } - - /* - * query by a part of sequence - * */ - public List readPart(String protIn) { - int row_count = 10000; - query = new ArrayList(); - /* - RangeSlicesQuery result = HFactory.createRangeSlicesQuery(cc.GetKeyspace(), StringSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - result.setColumnFamily("ProteinRow"); - result.setRange(null, null, false, Integer.MAX_VALUE); - result.setRowCount(row_count); - String last_key = null; - while (true) { - result.setKeys(last_key, null); - QueryResult> columnSlice = result.execute(); - OrderedRows rows = columnSlice.get(); - Iterator> rowsIterator = rows.iterator(); - while (rowsIterator.hasNext()) { - Row row = rowsIterator.next(); - last_key = row.getKey(); - if (last_key.matches("(.*)" + protIn + "(.*)")) { - Iterator> it = row.getColumnSlice().getColumns().iterator(); - while (it.hasNext()) { - HColumn col = it.next(); - List subProt = new ArrayList(); - String subStr = last_key; - while (subStr.length() > 0 && subStr.contains(protIn)) { - String first = subStr.substring(0, subStr.indexOf(protIn)); - if (first.length() > 0) - subProt.add(first); - subProt.add(protIn); - subStr = subStr.substring(subStr.indexOf(protIn) + protIn.length(), subStr.length()); - } - if (subStr.length() > 0) - subProt.add(subStr); - String name = col.getName(); - if (name.matches("(.*)jnetpred")) { - DataBase db = new DataBase(); - db.setProt(last_key); - db.setId(col.getName()); - db.setJpred(col.getValue()); - db.setSubProt(subProt); - query.add(db); - } - } - } - } - if (rows.getCount() < row_count) - break; - } - */ - return query; - } - - /* - * convert String date into long date (miliseconds since the epoch start) - */ - private static long DateParsing(String datInput) { - if (datInput == null) { - return 0; - } - long dateWorkSt = 0; - SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); - try { - dateWorkSt = formatter.parse(datInput).getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - return dateWorkSt; - } - - /* - * convert String date:time into long date:time (miliseconds since the epoch start) - */ - private static long TimeConvert(String datInput) { - long dateWorkSt = 0; - if (datInput == null) { - return dateWorkSt; - } - SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd:hh:mm:ss"); - try { - dateWorkSt = formatter.parse(datInput).getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - return dateWorkSt; - } - - // convert long to date in string format - private static String DateFormat(long inDate) { - SimpleDateFormat datformat = new SimpleDateFormat("dd/MM/yyyy"); - String dateString = datformat.format(new Date(inDate)); - return dateString; - } - - /* - * convert ??? - */ - public static String DateFormatYYMMDD(long indate) { - SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd"); - String dateString = datformat.format(new Date(indate)); - return dateString; - } - - /* - * ??? - */ - public long CountID(String id) { - /* - SliceQuery sliceQuery = HFactory.createSliceQuery(cc.GetKeyspace(), StringSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - sliceQuery.setColumnFamily("ProteinLog").setKey(id).setRange("", "", false, 100); - QueryResult> result = sliceQuery.execute(); - String datBegin = result.get().getColumnByName("DataBegin").getValue(); - String datEnd = result.get().getColumnByName("DataEnd").getValue(); - - long datBeginLong = TimeConvert(datBegin); - long datEndLong = TimeConvert(datEnd); - return (datEndLong - datBeginLong) / 1000; - */ - return 0; - } - - /* - * set earlest date and current dates. - * earlestDate is static and should be set at the 1st call - * currentDate should be re-calculated every time - */ - private static void SetDateRange() { - if (0 == earlestDate) { - StatisticsProt sp = new StatisticsProt(); - earlestDate = sp.earliestDate(); - System.out.println("Set earlest Date = " + earlestDate); - } - Calendar cal = Calendar.getInstance(); - currentDate = DateParsing(cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH)); - } - - public boolean isThisDateValid(String dateToValidate) { - if (dateToValidate == null || dateToValidate.equals("")) { - System.out.println("Undefined date"); - return false; - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); - try { - // if not valid, this will throw ParseException - sdf.setLenient(false); - Date date = sdf.parse(dateToValidate); - } catch (ParseException e) { - e.printStackTrace(); - return false; - } - return true; - } - - /* - * find the earliest date in the database - */ - public long earliestDate() { - ArrayList dateSort = new ArrayList(); - int row_count = 10000; - /* - RangeSlicesQuery result = HFactory.createRangeSlicesQuery(cc.GetKeyspace(), LongSerializer.get(), - StringSerializer.get(), StringSerializer.get()); - result.setColumnFamily("ProteinData"); - result.setRange(null, null, false, Integer.MAX_VALUE); - result.setRowCount(row_count); - Long last_key = null; - while (true) { - result.setKeys(last_key, null); - QueryResult> columnSlice = result.execute(); - OrderedRows rows = columnSlice.get(); - Iterator> rowsIterator = rows.iterator(); - while (rowsIterator.hasNext()) { - Row row = rowsIterator.next(); - last_key = row.getKey(); - dateSort.add(last_key); - } - if (rows.getCount() < row_count) - break; - }*/ - Collections.sort(dateSort); - return dateSort.get(0); - } -}