From: jprocter <Jim Procter>
Date: Fri, 29 Oct 2010 13:59:38 +0000 (+0000)
Subject: patch primary issue causing JAL-664 re testing for properly formed PIR file entry
X-Git-Tag: Release_2_6_1~20
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d8575e806483521cb97d94f266a904a046fb715f;p=jalview.git

patch primary issue causing JAL-664 re testing for properly formed PIR file entry
---

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index dc341b9..8a9a121 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -163,7 +163,7 @@ public class IdentifyFile
         else if (data.indexOf(">") > -1)
         {
           // FASTA, PIR file or BLC file
-          boolean checkPIR = false;
+          boolean checkPIR = false,starterm=false;
           if ((data.indexOf(">P1;") > -1) || (data.indexOf(">DL;") > -1))
           {
             // watch for PIR file attributes
@@ -180,8 +180,12 @@ public class IdentifyFile
           else
           {
             // Is this a single line BLC file?
-            source.nextLine();
+            String data1 = source.nextLine();
             String data2 = source.nextLine();
+            if (checkPIR)
+            {
+              starterm = (data1!=null && data1.indexOf("*")>-1) || (data2!=null && data2.indexOf("*")>-1);
+            }
             if (data2 != null && data.indexOf("*") > -1)
             {
               if (data.indexOf("*") == data2.indexOf("*"))
@@ -196,13 +200,40 @@ public class IdentifyFile
               // TODO : AMSA File is indicated if there is annotation in the
               // FASTA file - but FASTA will automatically generate this at the
               // mo.
-              break;
+              if (!checkPIR) {
+                break;
+              }
             }
           }
-          // TODO final check for PIR content. require
+          // final check for PIR content. require
           // >P1;title\n<blah>\nterminated sequence to occur at least once.
-          // the PIR/fasta ambiguity may be the use case that is needed to have
+
+          // TODO the PIR/fasta ambiguity may be the use case that is needed to have
           // a 'Parse as type XXX' parameter for the applet/application.
+          if (checkPIR)
+          {
+            String dta=null;
+            if (!starterm)
+            {
+              do {
+                try {
+                  dta = source.nextLine();
+                } catch(IOException ex) {};
+                if (dta!=null && dta.indexOf("*")>-1)
+                {
+                  starterm = true;
+                }
+              } while (dta!=null && !starterm);
+            }
+            if (starterm)
+            {
+              reply="PIR";
+              break;
+            } else {
+              reply="FASTA"; // probably a bad choice!
+            }
+          }
+          // read as a FASTA (probably)
           break;
         }
         else if (data.indexOf("HEADER") == 0 || data.indexOf("ATOM") == 0)