git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1641 added support for exporting sequence features and non auto-generated annotations
[jalview.git]
/
src
/
jalview
/
io
/
IdentifyFile.java
diff --git
a/src/jalview/io/IdentifyFile.java
b/src/jalview/io/IdentifyFile.java
index
08d4dca
..
94e6ebe
100755
(executable)
--- a/
src/jalview/io/IdentifyFile.java
+++ b/
src/jalview/io/IdentifyFile.java
@@
-1,30
+1,30
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
- *
+ *
* This file is part of Jalview.
* This file is part of Jalview.
- *
+ *
* Jalview is free software: you can redistribute it and/or
* Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * 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.
* 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
+ *
+ * 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.
* 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 <http://www.gnu.org/licenses/>.
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
* You should have received a copy of the GNU General Public License
* along with Jalview. If not, see <http://www.gnu.org/licenses/>.
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
+import java.io.IOException;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
@@
-32,10
+32,10
@@
public class IdentifyFile
{
/**
* Identify a datasource's file content.
{
/**
* Identify a datasource's file content.
- *
+ *
* @note Do not use this method for stream sources - create a FileParse object
* instead.
* @note Do not use this method for stream sources - create a FileParse object
* instead.
- *
+ *
* @param file
* DOCUMENT ME!
* @param protocol
* @param file
* DOCUMENT ME!
* @param protocol
@@
-60,7
+60,9
@@
public class IdentifyFile
emessage = e.getMessage();
}
if (parser != null)
emessage = e.getMessage();
}
if (parser != null)
+ {
return parser.errormessage;
return parser.errormessage;
+ }
return emessage;
}
return emessage;
}
@@
-73,7
+75,7
@@
public class IdentifyFile
/**
* Identify contents of source, closing it or resetting source to start
* afterwards.
/**
* Identify contents of source, closing it or resetting source to start
* afterwards.
- *
+ *
* @param source
* @param closeSource
* @return filetype string
* @param source
* @param closeSource
* @return filetype string
@@
-134,8
+136,19
@@
public class IdentifyFile
break;
}
break;
}
+ if (data.indexOf("{\"") > -1)
+ {
+ reply = JSONFile.FILE_DESC;
+ break;
+ }
+ // if (data.matches("<(\"[^\"]*\"|'[^']*'|[^'\">])*>"))
+ if (data.matches("<(?i)html(\"[^\"]*\"|'[^']*'|[^'\">])*>"))
+ {
+ reply = "HTML";
+ break;
+ }
- if ((data.indexOf("<") > -1))
+ if (data.matches("<(?i)rnaml (\"[^\"]*\"|'[^']*'|[^'\">])*>"))
{
reply = "RNAML";
{
reply = "RNAML";
@@
-207,7
+220,7
@@
public class IdentifyFile
else
{
reply = "FASTA"; // possibly a bad choice - may be recognised as
else
{
reply = "FASTA"; // possibly a bad choice - may be recognised as
- // PIR
+ // PIR
}
// otherwise can still possibly be a PIR file
}
}
// otherwise can still possibly be a PIR file
}
@@
-267,18
+280,25
@@
public class IdentifyFile
reply = "PDB";
break;
}
reply = "PDB";
break;
}
+ else if (data.matches("\\s*\\d+\\s+\\d+\\s*"))
+ {
+ reply = PhylipFile.FILE_DESC;
+ break;
+ }
+
+
/*
* // TODO comment out SimpleBLAST identification for Jalview 2.4.1 else
* if (!lineswereskipped && data.indexOf("BLAST")<4) { reply =
* "SimpleBLAST"; break;
/*
* // TODO comment out SimpleBLAST identification for Jalview 2.4.1 else
* if (!lineswereskipped && data.indexOf("BLAST")<4) { reply =
* "SimpleBLAST"; break;
- *
+ *
* } // end comments for Jalview 2.4.1
*/
else if (!lineswereskipped && data.charAt(0) != '*'
&& data.charAt(0) != ' '
&& data.indexOf(":") < data.indexOf(",")) // &&
* } // end comments for Jalview 2.4.1
*/
else if (!lineswereskipped && data.charAt(0) != '*'
&& data.charAt(0) != ' '
&& data.indexOf(":") < data.indexOf(",")) // &&
- // data.indexOf(",")<data.indexOf(",",
- // data.indexOf(",")))
+ // data.indexOf(",")<data.indexOf(",",
+ // data.indexOf(",")))
{
// file looks like a concise JNet file
reply = "JnetFile";
{
// file looks like a concise JNet file
reply = "JnetFile";
@@
-304,7
+324,7
@@
public class IdentifyFile
if (length == 0)
{
System.err
if (length == 0)
{
System.err
- .println("File Identification failed! - Empty file was read.");
+ .println("File Identification failed! - Empty file was read.");
return "EMPTY DATA FILE";
}
return reply;
return "EMPTY DATA FILE";
}
return reply;
@@
-312,6
+332,7
@@
public class IdentifyFile
public static void main(String[] args)
{
public static void main(String[] args)
{
+
for (int i = 0; args != null && i < args.length; i++)
{
IdentifyFile ider = new IdentifyFile();
for (int i = 0; args != null && i < args.length; i++)
{
IdentifyFile ider = new IdentifyFile();