X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPIRFile.java;h=910d18929e48d60b65664bc33312104b556b1335;hb=49cc4c921eac8fd966dfe4fa4b86d00655ea2f67;hp=724fea8016240612bc28241d53653f4b95a6c0be;hpb=69f23b44e8ce05b33fca23ffb3774c285a23dd9b;p=jalview.git

diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java
index 724fea8..910d189 100755
--- a/src/jalview/io/PIRFile.java
+++ b/src/jalview/io/PIRFile.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,23 +21,19 @@ package jalview.io;
 import java.io.*;
 import java.util.*;
 
-import jalview.analysis.*;
 import jalview.datamodel.*;
 
 public class PIRFile
     extends AlignFile
 {
+  public static boolean useModellerOutput = false;
+
   Vector words = new Vector(); //Stores the words in a line after splitting
 
   public PIRFile()
   {
   }
 
-  public PIRFile(String inStr)
-  {
-    super(inStr);
-  }
-
   public PIRFile(String inFile, String type)
       throws IOException
   {
@@ -45,59 +41,58 @@ public class PIRFile
   }
 
   public void parse()
+      throws IOException
   {
-    try
-    {
-      StringBuffer sequence;
-      String line = null;
+    StringBuffer sequence;
+    String line = null;
+    ModellerDescription md;
 
-      while ( (line = nextLine()) != null)
+    while ( (line = nextLine()) != null)
+    {
+      if (line.length() == 0)
       {
-        if (line.length() == 0)
-        {
-          //System.out.println("blank line");
-          continue;
-        }
-        if (line.indexOf("C;") == 0 || line.indexOf("#") == 0)
-        {
-          continue;
-        }
-        Sequence newSeq = parseId(line.substring(line.indexOf(";") + 1));
+        //System.out.println("blank line");
+        continue;
+      }
+      if (line.indexOf("C;") == 0 || line.indexOf("#") == 0)
+      {
+        continue;
+      }
+      Sequence newSeq = parseId(line.substring(line.indexOf(";") + 1));
 
-        sequence = new StringBuffer();
+      sequence = new StringBuffer();
 
-        newSeq.setDescription(nextLine()); // this is the title line
+      newSeq.setDescription(nextLine()); // this is the title line
 
-        boolean starFound = false;
+      boolean starFound = false;
 
-        while(!starFound)
-        {
-          line = nextLine();
-          sequence.append(line);
-
-          if (line == null)
-            break;
+      while (!starFound)
+      {
+        line = nextLine();
+        sequence.append(line);
 
-          if (line.indexOf("*") > -1)
-          {
-            starFound = true;
-          }
+        if (line == null)
+        {
+          break;
         }
 
-        if (sequence.length() > 0)
+        if (line.indexOf("*") > -1)
         {
-          sequence.setLength(sequence.length() - 1);
-          newSeq.setSequence(sequence.toString());
-          seqs.addElement(newSeq);
-          ModellerDescription md = new ModellerDescription(newSeq.
-              getDescription());
-          md.updateSequenceI(newSeq);
+          starFound = true;
         }
       }
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
+
+      if (sequence.length() > 0)
+      {
+        sequence.setLength(sequence.length() - 1);
+        newSeq.setSequence(sequence.toString());
+
+        seqs.addElement(newSeq);
+
+        md = new ModellerDescription(newSeq.
+                                     getDescription());
+        md.updateSequenceI(newSeq);
+      }
     }
   }
 
@@ -112,17 +107,27 @@ public class PIRFile
     int len = 72;
     StringBuffer out = new StringBuffer();
     int i = 0;
+    ModellerDescription md;
 
     while ( (i < s.length) && (s[i] != null))
     {
-      String seq = s[i].getSequence();
+      String seq = s[i].getSequenceAsString();
       seq = seq + "*";
 
       if (is_NA)
       {
         // modeller doesn't really do nucleotides, so we don't do anything fancy
-        // Nucleotide sequence tags should have a >DL; prefix
-        out.append(">P1;" + s[i].getName() + "\n"); // JBPNote Should change >P to >N
+        // Official tags area as follows, for now we'll use P1 and DL
+        // Protein (complete) P1
+        // Protein (fragment) F1
+        // DNA (linear) Dl
+        // DNA (circular) DC
+        // RNA (linear) RL
+        // RNA (circular) RC
+        // tRNA N3
+        // other functional RNA N1
+
+        out.append(">N1;" + s[i].getName() + "\n");
         if (s[i].getDescription() == null)
         {
           out.append(s[i].getName() + " " +
@@ -131,14 +136,32 @@ public class PIRFile
         }
         else
         {
-          out.append(s[i].getDescription()+"\n");
+          out.append(s[i].getDescription() + "\n");
         }
       }
       else
       {
-        out.append(">P1;" + s[i].getName() + "\n");
-        ModellerDescription md = new ModellerDescription(s[i]);
-        out.append(md.getDescriptionLine() + "\n");
+
+        if (useModellerOutput)
+        {
+          out.append(">P1;" + s[i].getName() + "\n");
+          md = new ModellerDescription(s[i]);
+          out.append(md.getDescriptionLine() + "\n");
+        }
+        else
+        {
+          out.append(">P1;" + printId(s[i]) + "\n");
+          if (s[i].getDescription() != null)
+          {
+            out.append(s[i].getDescription() + "\n");
+          }
+          else
+          {
+            out.append(s[i].getName() + " "
+                       + (s[i].getEnd() - s[i].getStart() + 1)
+                       + " residues\n");
+          }
+        }
       }
       int nochunks = (seq.length() / len) + 1;