First working web service for quering proteocache DB

[proteocache.git] / server / compbio / ws / jpred / JpredWS.java

diff --git a/server/compbio/ws/jpred/JpredWS.java b/server/compbio/ws/jpred/JpredWS.java
index 2f208ad..77d40da 100644 (file)
--- a/server/compbio/ws/jpred/JpredWS.java
+++ b/server/compbio/ws/jpred/JpredWS.java
@@ -2,21 +2,25 @@ package compbio.ws.jpred;
 
 import javax.jws.WebService;
 
+import org.apache.log4j.Logger;
+
 import compbio.cassandra.CassandraNativeConnector;
-import compbio.statistic.CassandraRequester;
+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";
        }
 
 }