X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=93f9a98d9de79ed21124fa519e616e3bc30a079a;hb=dfa04e77181fccfa6229ffef1591fc9c622d9b39;hp=dc341b9ef00ba2bf31e4ac462bdb281cda2e79b1;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index dc341b9..93f9a98 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -1,24 +1,24 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
import java.io.*;
-import java.net.*;
/**
* DOCUMENT ME!
@@ -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,13 +180,21 @@ public class IdentifyFile
else
{
// Is this a single line BLC file?
- source.nextLine();
+ String data1 = source.nextLine();
String data2 = source.nextLine();
- if (data2 != null && data.indexOf("*") > -1)
+ int c1;
+ if (checkPIR)
+ {
+ starterm = (data1 != null && data1.indexOf("*") > -1)
+ || (data2 != null && data2.indexOf("*") > -1);
+ }
+ if (data2 != null && (c1=data.indexOf("*")) > -1)
{
- if (data.indexOf("*") == data2.indexOf("*"))
+ if (c1==0 && c1 == data2.indexOf("*"))
{
reply = "BLC";
+ } else {
+ reply = "FASTA"; // possibly a bad choice - may be recognised as PIR
}
// otherwise can still possibly be a PIR file
}
@@ -196,13 +204,49 @@ 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\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)