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
Fix problem with new table column names: ProgrammeName -> ProgramName, Version -...
[proteocache.git]
/
datadb
/
compbio
/
cassandra
/
CassandraReaderOld.java
diff --git
a/datadb/compbio/cassandra/CassandraReaderOld.java
b/datadb/compbio/cassandra/CassandraReaderOld.java
index
852beb0
..
e08b39c
100644
(file)
--- a/
datadb/compbio/cassandra/CassandraReaderOld.java
+++ b/
datadb/compbio/cassandra/CassandraReaderOld.java
@@
-221,7
+221,7
@@
public class CassandraReaderOld {
for (Row r : rows) {
String prot = r.getString("Protein");
String prediction = findJnetpred(r.getMap("Predictions", String.class, String.class));
for (Row r : rows) {
String prot = r.getString("Protein");
String prediction = findJnetpred(r.getMap("Predictions", String.class, String.class));
- if (prot != null || prediction != null)
+ if (prot != null || prediction != null)
res.put(prot, prediction);
}
final long endTime = System.currentTimeMillis();
res.put(prot, prediction);
}
final long endTime = System.currentTimeMillis();
@@
-229,13
+229,14
@@
public class CassandraReaderOld {
return res;
}
return res;
}
- private String findJnetpred (Map<String,String> pred) {
+ private String findJnetpred(Map<String, String> pred) {
if (pred != null) {
if (pred != null) {
- if (pred.containsKey("jnetpred"))
+ if (pred.containsKey("jnetpred"))
return pred.get("jnetpred");
}
return null;
}
return pred.get("jnetpred");
}
return null;
}
+
/*
* getting protein sequences by counter
*/
/*
* getting protein sequences by counter
*/
@@
-313,7
+314,8
@@
public class CassandraReaderOld {
return null;
Row row1 = results1.one();
JobBean res = new JobBean(row.getString("Protein"), row.getString("JobID"), row.getString("DataBegin"), row.getString("DataEnd"),
return null;
Row row1 = results1.one();
JobBean res = new JobBean(row.getString("Protein"), row.getString("JobID"), row.getString("DataBegin"), row.getString("DataEnd"),
- row.getString("ip"), row1.getMap("Predictions", String.class, String.class));
+ row.getString("ip"), row1.getMap("Predictions", String.class, String.class), row.getString("ProgramName"),
+ row.getString("ProgramVersion"));
System.out.println("Query time is " + (queryTime - startTime) + " msec");
final long endTime = System.currentTimeMillis();
System.out.println(" rows analysed, execution time is " + (endTime - startTime) + " msec");
System.out.println("Query time is " + (queryTime - startTime) + " msec");
final long endTime = System.currentTimeMillis();
System.out.println(" rows analysed, execution time is " + (endTime - startTime) + " msec");