X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPIRFile.java;h=6d6e52578aa4f66dcd1d184e1aeb2c964794300b;hb=2535623533691d27fb7a23aef13d0f4f13be0a68;hp=65890a9543561baefead60ff4135acbe18e55794;hpb=f24dacb1da56fccf05d684e2f4899facec2aecf7;p=jalview.git

diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java
index 65890a9..6d6e525 100755
--- a/src/jalview/io/PIRFile.java
+++ b/src/jalview/io/PIRFile.java
@@ -21,7 +21,6 @@ package jalview.io;
 import java.io.*;
 import java.util.*;
 
-import jalview.analysis.*;
 import jalview.datamodel.*;
 
 public class PIRFile
@@ -44,49 +43,27 @@ public class PIRFile
     super(inFile, type);
   }
 
-  public void parse()
+  public void parse() throws IOException
   {
-    try
-    {
-      String id;
-      String start;
-      String end;
       StringBuffer sequence;
       String line = null;
 
       while ( (line = nextLine()) != null)
       {
-        if(line.length()==0)
+        if (line.length() == 0)
         {
           //System.out.println("blank line");
           continue;
         }
-
-        id = "No id";
-        start = "1";
-        end = "-1";
-
-        try
+        if (line.indexOf("C;") == 0 || line.indexOf("#") == 0)
         {
-          int slashIndex = line.indexOf("/");
-          if(slashIndex!=-1)
-          {
-            id = line.substring(line.indexOf(";") + 1, line.indexOf("/"));
-            line = line.substring(line.indexOf("/") + 1);
-            start = line.substring(0, line.indexOf("-"));
-            end = line.substring(line.indexOf("-") + 1);
-          }
-          else
-          {
-            id = line.substring(line.indexOf(";")+1);
-          }
+          continue;
         }
-        catch (Exception ex)
-        {    }// Default id, start and end unchanged
+        Sequence newSeq = parseId(line.substring(line.indexOf(";") + 1));
 
         sequence = new StringBuffer();
 
-        line = nextLine(); // this is the title line
+        newSeq.setDescription(nextLine()); // this is the title line
 
         boolean starFound = false;
 
@@ -104,21 +81,23 @@ public class PIRFile
           }
         }
 
-        if(sequence.length()>0)
+        if (sequence.length() > 0)
         {
           sequence.setLength(sequence.length() - 1);
+          newSeq.setSequence(sequence.toString());
+          if (!isValidProteinSequence(newSeq.getSequence()))
+          {
+            throw new IOException(AppletFormatAdapter.INVALID_CHARACTERS
+                                  +" : "+ newSeq.getName()
+                                  +" : "+invalidCharacter);
+          }
 
-          Sequence newSeq = new Sequence(id, sequence.toString(),
-                                         Integer.parseInt(start),
-                                         Integer.parseInt(end));
           seqs.addElement(newSeq);
+          ModellerDescription md = new ModellerDescription(newSeq.
+              getDescription());
+          md.updateSequenceI(newSeq);
         }
       }
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
   }
 
   public String print()
@@ -126,41 +105,40 @@ public class PIRFile
     return print(getSeqsAsArray());
   }
 
-  public static String print(SequenceI[] s)
-  {
-    return print(s, 72, true);
-  }
-
-  public static String print(SequenceI[] s, int len)
-  {
-    return print(s, len, true);
-  }
-
-  public static String print(SequenceI[] s, int len, boolean gaps)
+  public String print(SequenceI[] s)
   {
+    boolean is_NA = jalview.util.Comparison.isNucleotide(s);
+    int len = 72;
     StringBuffer out = new StringBuffer();
     int i = 0;
 
     while ( (i < s.length) && (s[i] != null))
     {
-      String seq = "";
+      String seq = s[i].getSequence();
+      seq = seq + "*";
 
-      if (gaps)
+      if (is_NA)
       {
-        seq = s[i].getSequence() + "*";
+        // modeller doesn't really do nucleotides, so we don't do anything fancy
+        // Nucleotide sequence tags should have a >DL; prefix
+        out.append(">N1;" + s[i].getName() + "\n"); // JBPNote Should change >P to >N
+        if (s[i].getDescription() == null)
+        {
+          out.append(s[i].getName() + " " +
+                     (s[i].getEnd() - s[i].getStart() + 1));
+          out.append(is_NA ? " bases\n" : " residues\n");
+        }
+        else
+        {
+          out.append(s[i].getDescription()+"\n");
+        }
       }
       else
       {
-        seq = AlignSeq.extractGaps(s[i].getSequence(), "-");
-        seq = AlignSeq.extractGaps(seq, ".");
-        seq = AlignSeq.extractGaps(seq, " ");
-        seq = seq + "*";
+        out.append(">P1;" + s[i].getName() + "\n");
+        ModellerDescription md = new ModellerDescription(s[i]);
+        out.append(md.getDescriptionLine() + "\n");
       }
-
-      out.append(">P1;" + s[i].getName() + "/" + s[i].getStart() + "-" +
-                 s[i].getEnd() + "\n");
-      out.append(" Dummy title\n");
-
       int nochunks = (seq.length() / len) + 1;
 
       for (int j = 0; j < nochunks; j++)