X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;h=214bf6f354b73526b406ceee6b7ac689de1de793;hb=1835d87d090291da1db317c27c7463191bfb54c4;hp=ec74c6f8312944e5fae62a1d848418f1a8368a48;hpb=34b63209df068b7671e40e5b298eb184785c83ac;p=proteocache.git

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index ec74c6f..214bf6f 100755
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -9,12 +9,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import compbio.cassandra.AnnotatedProteinSequenceBean;
 import compbio.cassandra.CassandraNativeConnector;
 import compbio.cassandra.CassandraReader;
 import compbio.cassandra.DataBase;
 import compbio.cassandra.Pair;
 import compbio.cassandra.StructureJobLog;
-import compbio.cassandra.StructureProteinPrediction;
 
 public class CassandraRequester {
 	private CassandraReader db = new CassandraReader();
@@ -156,35 +156,32 @@ public class CassandraRequester {
 		System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
 		return query;
 	}
+
 	/* 
 	 * query: protein sequence
 	 * */
 	public List<DataBase> readProteins(String protIn, String flag) {
 		query = new ArrayList<DataBase>();
-		List<StructureProteinPrediction> res;
+		List<AnnotatedProteinSequenceBean> res;
 		if (flag.equals("whole")) 
 			res = db.ReadWholeSequence(protIn);
 		 else 
 			res = db.ReadPartOfSequence(protIn);
 		if (res == null)
 			return null;
-		for (StructureProteinPrediction entry : res) {
-			Map<String,String> pred = entry.getPrediction();
-			Iterator it = pred.entrySet().iterator();
-			while (it.hasNext()) {
-				DataBase db = new DataBase();
-				db.setProt(entry.getSequence());
-				Map.Entry pairs = (Map.Entry)it.next();
-				db.setId(entry.getJobid());
-				db.setJpred(pairs.getValue().toString());
-				if (flag.equals("part"))
-					db.setSubProt(CreateSubprot (entry.getSequence(), protIn));				
-				query.add(db);
+		for (AnnotatedProteinSequenceBean entry : res) {
+			DataBase db = new DataBase();
+			db.setProt(entry.getSequence());
+			db.setPredictions(entry);
+			db.setId(entry.getJobid());
+			if (flag.equals("part")) {
+				db.setSubProt(CreateSubprot (entry.getSequence(), protIn));
 			}
+			query.add(db);
 		}
 		return query;
 	}
-	
+
 	/* 
 	 * query protein sequences with number of jobs
 	 */