X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fws%2Fjpred%2FJpredWS.java;h=77d40dab5bfae5ea7748f0c41588e3a5bfb3284d;hb=59d2a68840c0c7905419304095d91faa5ef3004c;hp=32b5399d976c597b2a47be5fa674ef23845ae477;hpb=2b24ce792ba524bf7e85bc8b2676495958701260;p=proteocache.git

diff --git a/server/compbio/ws/jpred/JpredWS.java b/server/compbio/ws/jpred/JpredWS.java
index 32b5399..77d40da 100644
--- a/server/compbio/ws/jpred/JpredWS.java
+++ b/server/compbio/ws/jpred/JpredWS.java
@@ -2,23 +2,25 @@ package compbio.ws.jpred;
 
 import javax.jws.WebService;
 
-import compbio.cassandra.CassandraNativeConnector;
-import compbio.statistic.CassandraRequester;
+import org.apache.log4j.Logger;
 
+import compbio.cassandra.CassandraNativeConnector;
+import compbio.cassandra.readers.SequenceReader;
 
-@WebService(endpointInterface = "compbio.ws.jpred.Jpred", 
-targetNamespace = "http://server.ws.compbio", serviceName = "JpredWS")
+@WebService(endpointInterface = "compbio.ws.jpred.Jpred", targetNamespace = "http://server.proteocache.ws", serviceName = "ProteoCacheWS", portName = "ProteoCacheWSPort")
 public class JpredWS implements Jpred {
+	private static Logger log = Logger.getLogger(CassandraNativeConnector.class);
 
 	@Override
-	public String findSequence(String sequence) {
+	public String findSequence(String sequence, String program, String version) {
 		CassandraNativeConnector dbconnector = new CassandraNativeConnector();
-		CassandraRequester cr = new CassandraRequester();
-		System.out.println("YES");
-		if (cr.readProteins(sequence, "whole") != null)
-			return "The sequence is " + sequence;
-		else
-			return "No sequence  " + sequence;
+		SequenceReader reader = new SequenceReader();
+		reader.setSession(dbconnector.getSession());
+		log.debug("ProteoCacheWS is connected:\n search for sequence: " + sequence + "\ncalculated wih  " + program + " (version; " + version + ")");
+		if (null != reader.readProteins(sequence, "whole")) {
+			return "The sequence " + sequence + " found. Calculated with " + program + "(" + version + ")";
+		}
+		return "The sequence " + sequence + " not found";
 	}
 
 }