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
delete DataBase beans
[proteocache.git]
/
server
/
compbio
/
controllers
/
SequenceController.java
diff --git
a/server/compbio/controllers/SequenceController.java
b/server/compbio/controllers/SequenceController.java
index
8e5bc29
..
c57ed1f
100644
(file)
--- a/
server/compbio/controllers/SequenceController.java
+++ b/
server/compbio/controllers/SequenceController.java
@@
-8,8
+8,8
@@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import compbio.cassandra.DataBase;
-
+import compbio.cassandra.ProteinBean;
+import compbio.cassandra.TotalByCounterBean;
import compbio.statistic.CassandraRequester;
/**
import compbio.statistic.CassandraRequester;
/**
@@
-42,11
+42,13
@@
public class SequenceController {
if (0 < trimmedsequence.length()) {
CassandraRequester cr = new CassandraRequester();
if (0 < trimmedsequence.length()) {
CassandraRequester cr = new CassandraRequester();
- List<DataBase> r = cr.readProteins(trimmedsequence, flag);
+ List<ProteinBean> r = cr.readProteins(trimmedsequence, flag);
model.put("results", r);
if (null != r) {
model.put("results", r);
if (null != r) {
- System.out.println("result size = " + r.size());
- model.put("njobs", r.size());
+ if (flag.equals("whole"))
+ model.put("njobs",r.get(0).getJobid().size());
+ else
+ model.put("njobs", r.size());
}
}
final long endTime = System.currentTimeMillis();
}
}
final long endTime = System.currentTimeMillis();
@@
-80,7
+82,7
@@
public class SequenceController {
}
CassandraRequester cr = new CassandraRequester();
}
CassandraRequester cr = new CassandraRequester();
- List<DataBase> r = cr.readProteinByCounter(realcounter);
+ List<TotalByCounterBean> r = cr.readProteinByCounter(realcounter);
model.put("results", r);
model.put("njobs", 0);
if (null != r) {
model.put("results", r);
model.put("njobs", 0);
if (null != r) {