X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2Fwebservices%2FWebserviceUtil.java;h=0dad04a9b5f39ddaeab51e07d9acb18b11cc2e22;hb=7dedda0956412b1081e68e7dbe33aee1ecb65892;hp=58fb1e05337adac6b7fa9eb0753c5b2335f0cbe0;hpb=9a7395cfe0de3a3405ac9e6105d0577bc45d30ff;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/webservices/WebserviceUtil.java b/forester/java/src/org/forester/archaeopteryx/webservices/WebserviceUtil.java index 58fb1e0..0dad04a 100644 --- a/forester/java/src/org/forester/archaeopteryx/webservices/WebserviceUtil.java +++ b/forester/java/src/org/forester/archaeopteryx/webservices/WebserviceUtil.java @@ -35,49 +35,58 @@ import org.forester.phylogeny.PhylogenyNode; import org.forester.phylogeny.data.Accession; import org.forester.phylogeny.data.Identifier; import org.forester.phylogeny.data.Sequence; +import org.forester.phylogeny.data.Taxonomy; import org.forester.phylogeny.iterators.PhylogenyNodeIterator; import org.forester.phylogeny.iterators.PreorderTreeIterator; import org.forester.util.ForesterUtil; +import org.forester.util.SequenceAccessionTools; public final class WebserviceUtil { - public static final String TREE_FAM_INST = "tree_fam"; - public static final String PFAM_INST = "pfam"; - public static final String TOL_WEBSERVER = "http://tolweb.org/onlinecontributors/app?service=external&page=xml/TreeStructureService&node_id=" - + PhylogeniesWebserviceClient.QUERY_PLACEHOLDER; - public static final String TOL_NAME = "Tree of Life"; - public static final String TREE_BASE_NAME = "TreeBASE"; - public static final String TREE_FAM_NAME = "TreeFam"; - public static final String PFAM_NAME = "Pfam"; - public static final String PFAM_SERVER = "http://pfam.janelia.org"; + public static final String PFAM_INST = "pfam"; + public static final String PFAM_NAME = "Pfam"; + public static final String PFAM_SERVER = "http://pfam.xfam.org"; + public static final String TOL_NAME = "Tree of Life (ToL)"; + public static final String TOL_URL_BASE = "http://tolweb.org/onlinecontributors/app?service=external&page=xml/TreeStructureService&node_id="; + public static final String TOL_WEBSERVER = TOL_URL_BASE + + PhylogeniesWebserviceClient.QUERY_PLACEHOLDER; + public static final String TREE_BASE_DESC = "This data set was downloaded from TreeBASE, a relational database of phylogenetic knowledge. TreeBASE has been supported by the NSF, Harvard University, Yale University, SDSC and UC Davis. Please do not remove this acknowledgment."; + public static final String TREE_BASE_INST = "treebase"; + public static final String TREE_BASE_NAME = "TreeBASE"; + public static final String TREE_FAM_INST = "tree_fam"; + public static final String TREE_FAM_NAME = "TreeFam"; + public static final String TREE_FAM_URL_BASE = "http://www.treefam.org/family/TF"; + public static final String TREEBASE_PHYLOWS_STUDY_URL_BASE = "http://purl.org/phylo/treebase/phylows/study/TB2:S"; + public static final String TREEBASE_PHYLOWS_TREE_URL_BASE = "http://purl.org/phylo/treebase/phylows/tree/TB2:Tr"; public static List createDefaultClients() { final List clients = new ArrayList(); - clients.add( new BasicPhylogeniesWebserviceClient( TOL_NAME, - "Read Tree from Tree of Life...", - "Use ToL webservice to obtain a evolutionary tree", - "Please enter a Tree of Life node identifier\n(Examples: " - + "19386 for Cephalopoda, 2461 for Cnidaria, 2466 for Deuterostomia)", - WsPhylogenyFormat.TOL_XML_RESPONSE, - PhylogenyMethods.PhylogenyNodeField.TAXONOMY_SCIENTIFIC_NAME, - WebserviceUtil.TOL_WEBSERVER, + clients.add( new BasicPhylogeniesWebserviceClient( TREE_BASE_NAME, + "Read Tree(s) from TreeBASE Study...", + "Use TreeBASE to obtain evolutionary tree(s) from a study", + "Please enter a TreeBASE study (\"S\") identifier (without the \"S\")\n(Examples: 14909, 14525, 15613, 15632)", + WsPhylogenyFormat.TREEBASE_STUDY, + null, + TREEBASE_PHYLOWS_STUDY_URL_BASE + + PhylogeniesWebserviceClient.QUERY_PLACEHOLDER + + "?format=nexus", true, - "http://tolweb.org", - null ) ); + "http://www.treebase.org", + TREE_BASE_INST ) ); clients.add( new BasicPhylogeniesWebserviceClient( TREE_BASE_NAME, "Read Tree from TreeBASE...", "Use TreeBASE to obtain a evolutionary tree", - "Please enter a TreeBASE tree identifier\n(Examples: 2654, 825, 4931, 2518, 2406, 4934)", - WsPhylogenyFormat.TREEBASE, + "Please enter a TreeBASE tree (\"Tr\") identifier (without the \"Tr\")\n(Examples: 2406, 422, 2654, 825, 4931, 2518, 4934)", + WsPhylogenyFormat.TREEBASE_TREE, null, - "http://purl.org/phylo/treebase/phylows/tree/TB2:Tr" + TREEBASE_PHYLOWS_TREE_URL_BASE + PhylogeniesWebserviceClient.QUERY_PLACEHOLDER + "?format=nexus", true, "http://www.treebase.org", - null ) ); + TREE_BASE_INST ) ); clients.add( new BasicPhylogeniesWebserviceClient( PFAM_NAME, - "Read Gene Tree from Pfam...", + "Read Domain Tree from Pfam...", "Use Pfam to obtain gene trees for seed alignments", "Please enter a Pfam (PF) accession number\n(Examples: 01849 for NAC, 00452 for Bcl-2, 00046 for Homeobox)", WsPhylogenyFormat.PFAM, @@ -94,15 +103,43 @@ public final class WebserviceUtil { "Please enter a TreeFam (TF) accession number\n(Examples: 101004 for Cyclin D, 315938 for Hox, 105310 for Wnt)", WsPhylogenyFormat.NHX, null, - "http://www.treefam.org/family/TF" + TREE_FAM_URL_BASE + PhylogeniesWebserviceClient.QUERY_PLACEHOLDER + "/tree/newick", true, "http://www.treefam.org", TREE_FAM_INST ) ); + clients.add( new BasicPhylogeniesWebserviceClient( TOL_NAME, + "Read Tree from Tree of Life (ToL)...", + "Use ToL webservice to obtain a evolutionary tree", + "Please enter a Tree of Life node identifier\n(Examples: " + + "14923 for ray-finned fishes, 19386 for Cephalopoda, 2461 for Cnidaria)", + WsPhylogenyFormat.TOL_XML_RESPONSE, + PhylogenyMethods.PhylogenyNodeField.TAXONOMY_SCIENTIFIC_NAME, + WebserviceUtil.TOL_WEBSERVER, + true, + "http://tolweb.org", + null ) ); return clients; } + public static void processInstructions( final PhylogeniesWebserviceClient client, final Phylogeny phylogeny ) + throws PhyloXmlDataFormatException { + if ( client.getProcessingInstructions().equals( WebserviceUtil.TREE_FAM_INST ) ) { + WebserviceUtil.processTreeFamTrees( phylogeny ); + } + else if ( client.getProcessingInstructions().equals( WebserviceUtil.PFAM_INST ) ) { + WebserviceUtil.extractSpTremblAccFromNodeName( phylogeny, "sptrembl" ); + PhylogenyMethods.transferInternalNodeNamesToConfidence( phylogeny, "bootstrap" ); + } + else if ( client.getProcessingInstructions().equals( WebserviceUtil.TREE_BASE_INST ) ) { + if ( PhylogenyMethods.isInternalNamesLookLikeConfidences( phylogeny ) ) { + PhylogenyMethods.transferInternalNodeNamesToConfidence( phylogeny, "" ); + } + WebserviceUtil.processTreeBaseTrees( phylogeny ); + } + } + static void extractSpTremblAccFromNodeName( final Phylogeny phy, final String source ) { final PreorderTreeIterator it = new PreorderTreeIterator( phy ); while ( it.hasNext() ) { @@ -123,34 +160,67 @@ public final class WebserviceUtil { } } - public static void processInstructions( final PhylogeniesWebserviceClient client, final Phylogeny phylogeny ) - throws PhyloXmlDataFormatException { - if ( client.getProcessingInstructions().equals( WebserviceUtil.TREE_FAM_INST ) ) { - WebserviceUtil.removeEventsInExternalNodes( phylogeny ); - WebserviceUtil.setTaxonomyIdentifierType( phylogeny, "ncbi" ); - } - else if ( client.getProcessingInstructions().equals( WebserviceUtil.PFAM_INST ) ) { - WebserviceUtil.extractSpTremblAccFromNodeName( phylogeny, "sptrembl" ); + static void processTreeBaseTrees( final Phylogeny phy ) { + phy.setDescription( TREE_BASE_DESC ); + final PhylogenyNodeIterator it = phy.iteratorExternalForward(); + while ( it.hasNext() ) { + final PhylogenyNode n = it.next(); + if ( !ForesterUtil.isEmpty( n.getName() ) ) { + final Accession acc = SequenceAccessionTools.parseAccessorFromString( n.getName() ); + if ( acc != null ) { + if ( !n.getNodeData().isHasSequence() ) { + n.getNodeData().addSequence( new Sequence() ); + } + final Sequence s = n.getNodeData().getSequence(); + if ( s.getAccession() == null ) { + s.setAccession( acc ); + } + } + } } } - static void setTaxonomyIdentifierType( final Phylogeny phy, final String type ) { + static void processTreeFamTrees( final Phylogeny phy ) { final PhylogenyNodeIterator it = phy.iteratorPostorder(); while ( it.hasNext() ) { final PhylogenyNode n = it.next(); + if ( n.isExternal() ) { + n.getNodeData().setEvent( null ); + if ( !ForesterUtil.isEmpty( n.getName() ) ) { + final Accession acc = SequenceAccessionTools.parseAccessorFromString( n.getName() ); + if ( acc != null ) { + if ( !n.getNodeData().isHasSequence() ) { + n.getNodeData().addSequence( new Sequence() ); + } + final Sequence s = n.getNodeData().getSequence(); + if ( s.getAccession() == null ) { + s.setAccession( acc ); + } + } + } + } + else { + if ( ( n.getBranchData() != null ) && n.getBranchData().isHasConfidences() + && ( n.getBranchData().getConfidence( 0 ) != null ) ) { + n.getBranchData().getConfidence( 0 ).setType( "bootstrap" ); + } + if ( !ForesterUtil.isEmpty( n.getName() ) ) { + if ( !n.getNodeData().isHasTaxonomy() ) { + n.getNodeData().addTaxonomy( new Taxonomy() ); + } + final Taxonomy t = n.getNodeData().getTaxonomy(); + if ( ForesterUtil.isEmpty( t.getScientificName() ) ) { + t.setScientificName( n.getName() ); + n.setName( "" ); + } + } + } if ( n.getNodeData().isHasTaxonomy() && ( n.getNodeData().getTaxonomy().getIdentifier() != null ) ) { n.getNodeData() .getTaxonomy() - .setIdentifier( new Identifier( n.getNodeData().getTaxonomy().getIdentifier().getValue(), type ) ); + .setIdentifier( new Identifier( n.getNodeData().getTaxonomy().getIdentifier().getValue(), + "ncbi" ) ); } } } - - static void removeEventsInExternalNodes( final Phylogeny phy ) { - final PhylogenyNodeIterator it = phy.iteratorExternalForward(); - while ( it.hasNext() ) { - final PhylogenyNode n = it.next(); - n.getNodeData().setEvent( null ); - } - } }