X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fclient%2FJws2Client.java;h=eda6533fc8d2d02ed04fd7a52724f729c66b1b89;hb=3644426ec0e9e9ceb798bd426085d8d9dd8dbb56;hp=1fc2a68cb3f22d7af410e3b916f005fb18d10c95;hpb=a79900255139dc7bcab23320de2a3630f6531107;p=jabaws.git

diff --git a/webservices/compbio/ws/client/Jws2Client.java b/webservices/compbio/ws/client/Jws2Client.java
index 1fc2a68..eda6533 100644
--- a/webservices/compbio/ws/client/Jws2Client.java
+++ b/webservices/compbio/ws/client/Jws2Client.java
@@ -37,10 +37,7 @@ import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -53,7 +50,7 @@ import compbio.data.msa.MsaWS;
 import compbio.data.msa.SequenceAnnotation;
 import compbio.data.sequence.Alignment;
 import compbio.data.sequence.FastaSequence;
-import compbio.data.sequence.Score;
+import compbio.data.sequence.ScoreManager;
 import compbio.data.sequence.SequenceUtil;
 import compbio.data.sequence.UnknownFileFormatException;
 import compbio.metadata.JobSubmissionException;
@@ -162,9 +159,9 @@ public class Jws2Client {
 				outStream = System.out;
 			}
 			if (service.getServiceType() == SequenceAnnotation.class) {
-				Map<String, HashSet<Score>> result = analize(inputFile,
+				ScoreManager result = analize(inputFile,
 						((SequenceAnnotation<T>) msaws), preset, customOptions);
-				assert result != null && !result.values().isEmpty() : "No Result reported!";
+
 				IOHelper.writeOut(outStream, result);
 			} else {
 				alignment = align(inputFile, (MsaWS<T>) msaws, preset,
@@ -204,14 +201,14 @@ public class Jws2Client {
 	 * @return Set<Score> the conservation scores
 	 * @throws UnknownFileFormatException
 	 */
-	<T> HashMap<String, HashSet<Score>> analize(File file,
-			SequenceAnnotation<T> wsproxy, Preset<T> preset,
-			List<Option<T>> customOptions) {
+	<T> ScoreManager analize(File file, SequenceAnnotation<T> wsproxy,
+			Preset<T> preset, List<Option<T>> customOptions) {
 
 		List<FastaSequence> fastalist = null;
-		HashMap<String, HashSet<Score>> scores = null;
+		ScoreManager scores = null;
 		try {
 			fastalist = SequenceUtil.openInputStream(file.getAbsolutePath());
+			assert !fastalist.isEmpty() : "Input is empty!";
 
 			String jobId = null;
 			if (customOptions != null && preset != null) {
@@ -223,11 +220,12 @@ public class Jws2Client {
 			} else if (preset != null) {
 				jobId = wsproxy.presetAnalize(fastalist, preset);
 			} else {
+				System.out.println("\n\ncalling analise.........");
 				jobId = wsproxy.analize(fastalist);
 			}
 			Thread.sleep(2000);
+
 			scores = wsproxy.getAnnotation(jobId);
-			assert scores != null && !scores.values().isEmpty() : "Scores are NULL";
 
 		} catch (IOException e) {
 			System.err
@@ -292,11 +290,12 @@ public class Jws2Client {
 			}
 		}
 		if (serv == null) {
-			System.err.println("Could not connect to " + url);
+			System.err.println("Could not connect to " + url
+					+ " the server is down?");
 			// FIXME
 		}
 		JABAService serviceIF = service.getInterface(serv);
-		log.log(Level.FINE, "Connected successfully!");
+		log.log(Level.INFO, "Connected successfully!");
 
 		return serviceIF;
 	}