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
inprogress
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
application
/
phyloxml_converter.java
diff --git
a/forester/java/src/org/forester/application/phyloxml_converter.java
b/forester/java/src/org/forester/application/phyloxml_converter.java
index
25497ec
..
164bfee
100644
(file)
--- a/
forester/java/src/org/forester/application/phyloxml_converter.java
+++ b/
forester/java/src/org/forester/application/phyloxml_converter.java
@@
-22,7
+22,7
@@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
package org.forester.application;
package org.forester.application;
@@
-68,9
+68,10
@@
public class phyloxml_converter {
final static private String ORDER_SUBTREES = "o";
final static private String NO_TREE_LEVEL_INDENDATION = "ni";
final static private String REPLACE_UNDER_SCORES = "ru";
final static private String ORDER_SUBTREES = "o";
final static private String NO_TREE_LEVEL_INDENDATION = "ni";
final static private String REPLACE_UNDER_SCORES = "ru";
+ final static private String IGNORE_QUOTES = "iqs";
final static private String PRG_NAME = "phyloxml_converter";
final static private String PRG_NAME = "phyloxml_converter";
- final static private String PRG_VERSION = "1.30";
- final static private String PRG_DATE = "2011.03.01";
+ final static private String PRG_VERSION = "1.301";
+ final static private String PRG_DATE = "2012.08.31";
final static private String E_MAIL = "phylosoft@gmail.com";
final static private String WWW = "www.phylosoft.org/forester/";
final static private boolean SPECIAL = false;
final static private String E_MAIL = "phylosoft@gmail.com";
final static private String WWW = "www.phylosoft.org/forester/";
final static private boolean SPECIAL = false;
@@
-104,6
+105,7
@@
public class phyloxml_converter {
allowed_options.add( REPLACE_UNDER_SCORES );
allowed_options.add( EXTRACT_TAXONOMY );
allowed_options.add( EXTRACT_TAXONOMY_PF );
allowed_options.add( REPLACE_UNDER_SCORES );
allowed_options.add( EXTRACT_TAXONOMY );
allowed_options.add( EXTRACT_TAXONOMY_PF );
+ allowed_options.add( IGNORE_QUOTES );
if ( cla.getNumberOfNames() != 2 ) {
System.out.println();
System.out.println( "[" + PRG_NAME + "] incorrect number of arguments" );
if ( cla.getNumberOfNames() != 2 ) {
System.out.println();
System.out.println( "[" + PRG_NAME + "] incorrect number of arguments" );
@@
-158,6
+160,10
@@
public class phyloxml_converter {
ForesterUtil.fatalError( PRG_NAME, "unknown value for -\"" + FIELD_OPTION + "\" option: \""
+ field_option_value + "\"" );
}
ForesterUtil.fatalError( PRG_NAME, "unknown value for -\"" + FIELD_OPTION + "\" option: \""
+ field_option_value + "\"" );
}
+ boolean ignore_quotes = false;
+ if ( cla.isOptionSet( IGNORE_QUOTES ) ) {
+ ignore_quotes = true;
+ }
boolean int_values_are_boots = false;
if ( cla.isOptionSet( INTERNAL_NAMES_ARE_BOOT_SUPPPORT ) ) {
int_values_are_boots = true;
boolean int_values_are_boots = false;
if ( cla.isOptionSet( INTERNAL_NAMES_ARE_BOOT_SUPPPORT ) ) {
int_values_are_boots = true;
@@
-204,19
+210,20
@@
public class phyloxml_converter {
&& ( field != PhylogenyMethods.PhylogenyNodeField.TAXONOMY_SCIENTIFIC_NAME ) ) {
if ( extr_taxonomy_pf_only ) {
( ( NHXParser ) parser )
&& ( field != PhylogenyMethods.PhylogenyNodeField.TAXONOMY_SCIENTIFIC_NAME ) ) {
if ( extr_taxonomy_pf_only ) {
( ( NHXParser ) parser )
- .setTaxonomyExtraction( PhylogenyMethods.TAXONOMY_EXTRACTION.PFAM_STYLE_ONLY );
+ .setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
replace_underscores = false;
}
else if ( extr_taxonomy ) {
replace_underscores = false;
}
else if ( extr_taxonomy ) {
- ( ( NHXParser ) parser ).setTaxonomyExtraction( PhylogenyMethods.TAXONOMY_EXTRACTION.YES );
+ ( ( NHXParser ) parser )
+ .setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
replace_underscores = false;
}
}
else {
replace_underscores = false;
}
}
else {
- ( ( NHXParser ) parser ).setTaxonomyExtraction( PhylogenyMethods.TAXONOMY_EXTRACTION.NO );
+ ( ( NHXParser ) parser ).setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.NO );
}
( ( NHXParser ) parser ).setReplaceUnderscores( replace_underscores );
}
( ( NHXParser ) parser ).setReplaceUnderscores( replace_underscores );
- ( ( NHXParser ) parser ).setIgnoreQuotes( false );
+ ( ( NHXParser ) parser ).setIgnoreQuotes( ignore_quotes );
}
else if ( parser instanceof NexusPhylogeniesParser ) {
( ( NexusPhylogeniesParser ) parser ).setReplaceUnderscores( replace_underscores );
}
else if ( parser instanceof NexusPhylogeniesParser ) {
( ( NexusPhylogeniesParser ) parser ).setReplaceUnderscores( replace_underscores );
@@
-377,21
+384,22
@@
public class phyloxml_converter {
System.out.println();
System.out.println( " options: " );
System.out.println( " -" + INTERNAL_NAMES_ARE_BOOT_SUPPPORT
System.out.println();
System.out.println( " options: " );
System.out.println( " -" + INTERNAL_NAMES_ARE_BOOT_SUPPPORT
- + " : internal names in NH or NHX tree are bootstrap support values" );
- System.out.println( " -" + REPLACE_UNDER_SCORES + ": replace all underscores with spaces" );
- System.out.println( " -" + MIDPOINT_REROOT + " : midpoint reroot" );
- System.out.println( " -" + ORDER_SUBTREES + " : order subtrees" );
+ + " : internal names in NH or NHX tree are bootstrap support values" );
+ System.out.println( " -" + REPLACE_UNDER_SCORES + " : replace all underscores with spaces" );
+ System.out.println( " -" + MIDPOINT_REROOT + " : midpoint reroot" );
+ System.out.println( " -" + ORDER_SUBTREES + " : order subtrees" );
System.out
.println( " -"
+ EXTRACT_TAXONOMY
System.out
.println( " -"
+ EXTRACT_TAXONOMY
- + ": extract taxonomy to taxonomy code from \"seqname_TAXON\"-style names (cannot be used with the following field options: "
+ + " : extract taxonomy to taxonomy code from \"seqname_TAXON\"-style names (cannot be used with the following field options: "
+ FIELD_TAXONOMY_CODE + ", " + FIELD_TAXONOMY_COMM_NAME + ", " + FIELD_TAXONOMY_SCI_NAME + ")" );
System.out
.println( " -"
+ EXTRACT_TAXONOMY_PF
+ FIELD_TAXONOMY_CODE + ", " + FIELD_TAXONOMY_COMM_NAME + ", " + FIELD_TAXONOMY_SCI_NAME + ")" );
System.out
.println( " -"
+ EXTRACT_TAXONOMY_PF
- + ": extract taxonomy to taxonomy code from Pfam (\"seqname_TAXON/x-y\") style names only (cannot be used with the following field options: "
+ + " : extract taxonomy to taxonomy code from Pfam (\"seqname_TAXON/x-y\") style names only (cannot be used with the following field options: "
+ FIELD_TAXONOMY_CODE + ", " + FIELD_TAXONOMY_COMM_NAME + ", " + FIELD_TAXONOMY_SCI_NAME + ")" );
+ FIELD_TAXONOMY_CODE + ", " + FIELD_TAXONOMY_COMM_NAME + ", " + FIELD_TAXONOMY_SCI_NAME + ")" );
- System.out.println( " -" + NO_TREE_LEVEL_INDENDATION + ": no tree level indendation in phyloXML output" );
+ System.out.println( " -" + NO_TREE_LEVEL_INDENDATION + " : no tree level indendation in phyloXML output" );
+ System.out.println( " -" + IGNORE_QUOTES + ": ignore quotes and whitespace (e.g. \"a b\" becomes ab)" );
System.out.println();
}
}
System.out.println();
}
}