ModellerOutput set in preferences

[jalview.git] / src / jalview / io / PIRFile.java

diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java
index d4b818b..b958456 100755 (executable)
--- a/src/jalview/io/PIRFile.java
+++ b/src/jalview/io/PIRFile.java
@@ -21,12 +21,13 @@ package jalview.io;
 import java.io.*;\r
 import java.util.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 \r
 public class PIRFile\r
     extends AlignFile\r
 {\r
+  public static boolean useModellerOutput = false;\r
+\r
   Vector words = new Vector(); //Stores the words in a line after splitting\r
 \r
   public PIRFile()\r
@@ -44,21 +45,23 @@ public class PIRFile
     super(inFile, type);\r
   }\r
 \r
-  public void parse()\r
+  public void parse() throws IOException\r
   {\r
-    try\r
-    {\r
       StringBuffer sequence;\r
       String line = null;\r
+      ModellerDescription md;\r
 \r
       while ( (line = nextLine()) != null)\r
       {\r
-        if(line.length()==0)\r
+        if (line.length() == 0)\r
         {\r
           //System.out.println("blank line");\r
           continue;\r
         }\r
-\r
+        if (line.indexOf("C;") == 0 || line.indexOf("#") == 0)\r
+        {\r
+          continue;\r
+        }\r
         Sequence newSeq = parseId(line.substring(line.indexOf(";") + 1));\r
 \r
         sequence = new StringBuffer();\r
@@ -81,19 +84,24 @@ public class PIRFile
           }\r
         }\r
 \r
-        if(sequence.length()>0)\r
+        if (sequence.length() > 0)\r
         {\r
           sequence.setLength(sequence.length() - 1);\r
-\r
           newSeq.setSequence(sequence.toString());\r
+          if (!isValidProteinSequence(newSeq.getSequence()))\r
+          {\r
+            throw new IOException(AppletFormatAdapter.INVALID_CHARACTERS\r
+                                  +" : "+ newSeq.getName()\r
+                                  +" : "+invalidCharacter);\r
+          }\r
+\r
           seqs.addElement(newSeq);\r
+\r
+          md = new ModellerDescription(newSeq.\r
+                getDescription());\r
+          md.updateSequenceI(newSeq);\r
         }\r
       }\r
-    }\r
-    catch (Exception ex)\r
-    {\r
-      ex.printStackTrace();\r
-    }\r
   }\r
 \r
   public String print()\r
@@ -107,20 +115,58 @@ public class PIRFile
     int len = 72;\r
     StringBuffer out = new StringBuffer();\r
     int i = 0;\r
+    ModellerDescription md;\r
 \r
     while ( (i < s.length) && (s[i] != null))\r
     {\r
       String seq = s[i].getSequence();\r
       seq = seq + "*";\r
 \r
-      out.append(">P1;" + printId(s[i]) + "\n");\r
 \r
-      if(s[i].getDescription()!=null)\r
-        out.append(s[i].getDescription()+"\n");\r
+      if (is_NA)\r
+      {\r
+          // modeller doesn't really do nucleotides, so we don't do anything fancy\r
+          // Official tags area as follows, for now we'll use P1 and DL\r
+          // Protein (complete) P1\r
+          // Protein (fragment) F1\r
+          // DNA (linear) Dl\r
+          // DNA (circular) DC\r
+          // RNA (linear) RL\r
+          // RNA (circular) RC\r
+          // tRNA N3\r
+          // other functional RNA N1\r
+\r
+        out.append(">N1;" + s[i].getName() + "\n");\r
+        if (s[i].getDescription() == null)\r
+        {\r
+          out.append(s[i].getName() + " " +\r
+                     (s[i].getEnd() - s[i].getStart() + 1));\r
+          out.append(is_NA ? " bases\n" : " residues\n");\r
+        }\r
+        else\r
+        {\r
+          out.append(s[i].getDescription()+"\n");\r
+        }\r
+      }\r
       else\r
       {\r
-        out.append(s[i].getName()+" "+ (s[i].getEnd() - s[i].getStart() + 1));\r
-        out.append( is_NA ? " bases\n" : " residues\n");\r
+\r
+       if(useModellerOutput)\r
+       {\r
+         out.append(">P1;" + s[i].getName() + "\n");\r
+         md = new ModellerDescription(s[i]);\r
+         out.append(md.getDescriptionLine() + "\n");\r
+       }\r
+       else\r
+       {\r
+         out.append(">P1;" + printId(s[i]) + "\n");\r
+         if (s[i].getDescription() != null)\r
+           out.append(s[i].getDescription() + "\n");\r
+         else\r
+           out.append(s[i].getName() + " "\r
+                      + (s[i].getEnd() - s[i].getStart() + 1)\r
+                      + " residues\n");\r
+       }\r
       }\r
       int nochunks = (seq.length() / len) + 1;\r
 \r