X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FJPredClient.java;h=4cb8aeeb348f1c4e28c79b0cc62c732edcddd2f7;hb=a487459285df2b2e06047098ad8cb8e4920b41b8;hp=04a6101f3196bd7a77884f81ee625a2b3660a8ae;hpb=cbccf5d4e522cfcbe4f61609cee61f7128f183ec;p=jalview.git

diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index 04a6101..4cb8aee 100755
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -26,6 +26,7 @@ import ext.vamsas.*;
 import jalview.analysis.*;
 import jalview.datamodel.*;
 import jalview.gui.*;
+import jalview.io.FormatAdapter;
 
 public class JPredClient
     extends WSClient
@@ -63,15 +64,17 @@ public class JPredClient
                            title + ") on sequence :\n>" + seq.getName() + "\n" +
                            AlignSeq.extractGaps("-. ", seq.getSequence()) +
                            "\n");
-
-    SequenceInfo = jalview.analysis.SeqsetUtils.SeqCharacterHash(seq);
+    SequenceI aln[] = new SequenceI[msf.length];
+    for (int i=0,j=msf.length; i<j;i++)
+      aln[i] = new jalview.datamodel.Sequence(msf[i]);
+    SequenceInfo = jalview.analysis.SeqsetUtils.uniquify(aln, true);
 
     if (!locateWebService())
     {
       return;
     }
 
-    JPredThread jthread = new JPredThread(msf);
+    JPredThread jthread = new JPredThread(aln);
     jthread.start();
   }
 
@@ -134,7 +137,7 @@ public class JPredClient
                              " Service location failed\nfor URL :" + WsURL +
                              "\n" +
                              ex.getMessage());
-      wsInfo.setStatus(wsInfo.STATE_STOPPED_SERVERERROR);
+      wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);
 
       return false;
     }
@@ -169,9 +172,9 @@ public class JPredClient
       this.sequence.setSeq(AlignSeq.extractGaps("-. ",
                                                 msf[0].getSequence()));
 
-      jalview.io.PileUpfile mwrite = new jalview.io.PileUpfile();
       this.msa = new vamsas.objects.simple.Msfalignment();
-      msa.setMsf(mwrite.print(msf));
+      jalview.io.PileUpfile pileup = new jalview.io.PileUpfile();
+      msa.setMsf(pileup.print(msf));
     }
 
     public void run()
@@ -188,7 +191,7 @@ public class JPredClient
                 "Timed out when communicating with server\nTry again later.\n"));
           }
           if (result.getState()==0)
-            jalview.bin.Jalview.log.debug("Finished "+jobId);
+            jalview.bin.Cache.log.debug("Finished "+jobId);
           if (result.isRunning())
           {
             wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);
@@ -246,16 +249,29 @@ public class JPredClient
           {
           }
         }
+        catch (OutOfMemoryError er)
+        {
+          jobComplete = true;
+          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                                "Out of memory handling result!!"
+                                                +
+              "\nSee help files for increasing Java Virtual Machine memory."
+                                                , "Out of memory",
+                                                JOptionPane.WARNING_MESSAGE);
+          System.out.println("JPredClient: "+er);
+          System.gc();
+        }
       }
-
-      if (! (result.isJobFailed() || result.isServerError()))
-      {
-        wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_OK);
-      }
-      else
-      {
-        wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
-      }
+      if (result!=null)
+        if (! (result.isJobFailed() || result.isServerError()))
+        {
+          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_OK);
+        }
+        else
+        {
+          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
+        }
     }
 
     void StartJob()
@@ -289,25 +305,36 @@ public class JPredClient
       }
       catch (Exception e)
       {
-        wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);
-        allowedServerExceptions = 0;
-        jobComplete = false;
-
-        wsInfo.appendProgressText("Failed to submit the prediction.\n"
-                                  +
-                                  "It is most likely that there is a problem with the server.\n"
-                                  + "Just close the window\n");
-        System.err.println(
-            "JPredWS Client: Failed to submit the prediction (Probably a server error - see below)\n" +
-            e.toString() + "\n");
-
-        jalview.bin.Jalview.log.debug("Failed Submission",e);
+        if (e.getMessage().indexOf("Exception")>-1) {
+          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);
+          wsInfo.setProgressText(
+              "Failed to submit the prediction. (Just close the window)\n"
+              +
+              "It is most likely that there is a problem with the server.\n");
+          System.err.println(
+              "JPredWS Client: Failed to submit the prediction. Quite possibly because of a server error - see below)\n" +
+              e.getMessage() + "\n");
+
+          jalview.bin.Cache.log.warn("Server Exception",e);
+        } else {
+          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
+          // JBPNote - this could be a popup informing the user of the problem.
+          wsInfo.setProgressText("Failed to submit the prediction:\n"
+                                 +e.getMessage()+
+                                 wsInfo.getProgressText());
+
+          jalview.bin.Cache.log.debug("Failed Submission",e);
+
+        }
+        allowedServerExceptions = -1;
+        jobComplete = true;
+
       }
     }
 
 
 
-    private void addFloatAnnotations(Alignment al, int[] gapmap,
+  /*  private void addFloatAnnotations(Alignment al, int[] gapmap,
                                      Vector values, String Symname,
                                      String Visname, float min,
                                      float max, int winLength)
@@ -323,7 +350,7 @@ public class JPredClient
 
       al.addAnnotation(new AlignmentAnnotation(Symname, Visname,
                                                annotations, min, max, winLength));
-    }
+    }*/
 
     void parseResult()
     {
@@ -350,29 +377,42 @@ public class JPredClient
         OutputHeader += ("\n" + result.getAligfile());
       }
 
-      wsInfo.setProgressText(OutputHeader);
+      wsInfo.setProgressText(OutputHeader+"Parsing...");
 
       try
       {
+        jalview.bin.Cache.log.debug("Parsing output from JNet job.");
         // JPredFile prediction = new JPredFile("C:/JalviewX/files/jpred.txt", "File");
         jalview.io.JPredFile prediction = new jalview.io.JPredFile(result.
             getPredfile(),
             "Paste");
         SequenceI[] preds = prediction.getSeqsAsArray();
+        jalview.bin.Cache.log.debug("Got prediction profile.");
         Alignment al;
         int FirstSeq; // the position of the query sequence in Alignment al
         boolean noMsa = true; // set if no MSA has been returned by JPred
 
         if ( (this.msa != null) && (result.getAligfile() != null))
         {
+          jalview.bin.Cache.log.debug("Getting associated alignment.");
           // we ignore the returned alignment if we only predicted on a single sequence
           String format = jalview.io.IdentifyFile.Identify(result.getAligfile(),
               "Paste");
 
           if (jalview.io.FormatAdapter.formats.contains(format))
           {
-            al = new Alignment(jalview.io.FormatAdapter.readFile(
+            al = new Alignment(new FormatAdapter().readFile(
                 result.getAligfile(), "Paste", format));
+            for (int i=0, j=al.getHeight(); i<j; i++) {
+              SequenceI sq = al.getSequenceAt(i);
+              if (!jalview.analysis.SeqsetUtils.SeqCharacterUnhash(
+                  sq, (Hashtable) SequenceInfo.get(sq.getName())))
+              {
+                throw (new Exception(
+                    "Couldn't recover sequence properties for JNet "
+                    +((i==0) ? "Query sequence" : "alignment sequence ("+i+")")));
+              }
+            }
             noMsa = false;
             FirstSeq = 0;
           }
@@ -387,14 +427,14 @@ public class JPredClient
         {
           al = new Alignment(preds);
           FirstSeq = prediction.getQuerySeqPosition();
+          if (!jalview.analysis.SeqsetUtils.SeqCharacterUnhash(
+              al.getSequenceAt(FirstSeq), SequenceInfo))
+          {
+            throw (new Exception(
+                "Couldn't recover sequence properties for JNet Query sequence!"));
+          }
         }
 
-        if (!jalview.analysis.SeqsetUtils.SeqCharacterUnhash(
-            al.getSequenceAt(FirstSeq), SequenceInfo))
-        {
-          throw (new Exception(
-              "Couldn't recover sequence properties for JNet Query sequence!"));
-        }
 
         AlignmentAnnotation annot;
         Annotation[] annotations = null;
@@ -478,7 +518,7 @@ public class JPredClient
           i++;
         }
 
-        Hashtable scores = prediction.getScores();
+        //Hashtable scores = prediction.getScores();
 
         /*  addFloatAnnotations(al, gapmap,  (Vector)scores.get("JNETPROPH"),
                               "JnetpropH", "Jnet Helix Propensity", 0f,1f,1);
@@ -489,6 +529,9 @@ public class JPredClient
           addFloatAnnotations(al, gapmap,  (Vector)scores.get("JNETPROPC"),
                               "JnetpropC", "Jnet Coil Propensity", 0f,1f,1);
          */
+
+        wsInfo.setProgressText(OutputHeader);
+        jalview.bin.Cache.log.debug("Finished parsing output.");
         AlignFrame af = new AlignFrame(al);
 
         Desktop.addInternalFrame(af, altitle,
@@ -497,8 +540,8 @@ public class JPredClient
       }
       catch (Exception ex)
       {
-        jalview.bin.Jalview.log.warn("Exception whilst parsing JNet style secondary structure prediction.");
-        jalview.bin.Jalview.log.debug(ex);
+        jalview.bin.Cache.log.warn("Exception whilst parsing JNet style secondary structure prediction.");
+        jalview.bin.Cache.log.debug("Exception: ",ex);
       }
     }
   }