Fixes to test cases

[jabaws.git] / webservices / compbio / ws / client / Jws2Client.java

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