git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 733f974)
in progress
authorcmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Tue, 25 Mar 2014 21:59:04 +0000 (21:59 +0000)
committercmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Tue, 25 Mar 2014 21:59:04 +0000 (21:59 +0000)
forester/data/tol_156.xml patch | blob | history

diff --git a/forester/data/tol_156.xml b/forester/data/tol_156.xml
index 1219c70..c7621d8 100644 (file)
--- a/forester/data/tol_156.xml
+++ b/forester/data/tol_156.xml
@@ -1579,9 +1579,13 @@
                                           <taxonomy>\r
                                             <id provider="uniprot">50557</id>\r
                                             <scientific_name>Insecta</scientific_name>\r
-                                            <common_name>true insects</common_name>\r
                                             <rank>class</rank>\r
                                           </taxonomy>\r
+                                          <reference doi="10.1146/annurev-ento-120710-100538">\r
+                                            <desc>Advances in Insect Phylogeny at the Dawn of the Postgenomic Era</desc>\r
+                                          </reference>\r
+                                          <reference>\r
+                                          </reference>\r
                                           <clade>\r
                                             <taxonomy>\r
                                               <id provider="uniprot">33340</id>\r
@@ -1592,12 +1596,18 @@
                                               <taxonomy>\r
                                                 <id provider="uniprot">33392</id>\r
                                                 <scientific_name>Endopterygota</scientific_name>\r
+                                                <synonym>Holometabola</synonym>\r
                                                 <rank>infraclass</rank>\r
                                               </taxonomy>\r
                                               <clade>\r
-                                                <name>Hymenoptera &amp; Lepidoptera &amp; Diptera</name>\r
+                                                <name>Mecopterida &amp; Neuropteroidea</name>\r
                                                 <clade>\r
-                                                  <name>Lepidoptera &amp; Diptera</name>\r
+                                                  <taxonomy>\r
+                                                    <scientific_name>Mecopterida</scientific_name>\r
+                                                  </taxonomy>\r
+                                                  <reference>\r
+                                                    <desc>The position of the Hymenoptera within the Holometabola as inferred from the mitochondrial genome of Perga condei</desc>\r
+                                                  </reference>\r
                                                   <clade>\r
                                                     <taxonomy>\r
                                                       <id provider="uniprot">7147</id>\r
@@ -1812,8 +1822,8 @@
                                                   </clade>\r
                                                   <clade>\r
                                                     <taxonomy>\r
-                                                      <id provider="uniprot">104431</id>\r
-                                                      <scientific_name>Obtectomera</scientific_name>\r
+                                                      <id provider="uniprot">37567</id>\r
+                                                      <scientific_name>Ditrysia</scientific_name>\r
                                                     </taxonomy>\r
                                                     <clade>\r
                                                       <taxonomy>\r
@@ -1840,97 +1850,176 @@
                                                 </clade>\r
                                                 <clade>\r
                                                   <taxonomy>\r
-                                                    <id provider="uniprot">7400</id>\r
-                                                    <scientific_name>Apocrita</scientific_name>\r
-                                                    <common_name>wasps, ants and bees</common_name>\r
+                                                    <id provider="uniprot">41088</id>\r
+                                                    <scientific_name>Cucujiformia</scientific_name>\r
+                                                    <rank>infraorder</rank>\r
                                                   </taxonomy>\r
                                                   <clade>\r
                                                     <taxonomy>\r
-                                                      <id provider="uniprot">7434</id>\r
-                                                      <scientific_name>Aculeata</scientific_name>\r
-                                                      <rank>suborder</rank>\r
+                                                      <id provider="uniprot">217634</id>\r
+                                                      <code>ANOGL</code>\r
+                                                      <scientific_name>Anoplophora glabripennis</scientific_name>\r
+                                                      <common_name>Asian longhorn beetle</common_name>\r
+                                                      <synonym>Anoplophora nobilis</synonym>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://bugguide.net/images/cache/WZMLBZXL2Z2HTH4HHR2H3H2HJH9H9Z5LJH5LWZ7LAZSLTH4HPZXHDHKLVZEH9ZEHRRPHJH7LAZPHZR4L3H7H3H9HZR.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">7070</id>\r
+                                                      <code>TRICA</code>\r
+                                                      <scientific_name>Tribolium castaneum</scientific_name>\r
+                                                      <common_name>Red flour beetle</common_name>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://upload.wikimedia.org/wikipedia/commons/d/da/Tribolium_castaneum.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                </clade>\r
+                                              </clade>\r
+                                              <clade>\r
+                                                <taxonomy>\r
+                                                  <id provider="uniprot">7400</id>\r
+                                                  <scientific_name>Apocrita</scientific_name>\r
+                                                  <common_name>wasps, ants and bees</common_name>\r
+                                                </taxonomy>\r
+                                                <clade>\r
+                                                  <taxonomy>\r
+                                                    <id provider="uniprot">7434</id>\r
+                                                    <scientific_name>Aculeata</scientific_name>\r
+                                                    <rank>suborder</rank>\r
+                                                  </taxonomy>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">36668</id>\r
+                                                      <scientific_name>Formicidae</scientific_name>\r
+                                                      <rank>family</rank>\r
                                                     </taxonomy>\r
                                                     <clade>\r
                                                       <taxonomy>\r
-                                                        <id provider="uniprot">36668</id>\r
-                                                        <scientific_name>Formicidae</scientific_name>\r
-                                                        <common_name>ants</common_name>\r
-                                                        <rank>family</rank>\r
+                                                        <id provider="uniprot">34695</id>\r
+                                                        <scientific_name>Myrmicinae</scientific_name>\r
+                                                        <rank>subfamily</rank>\r
                                                       </taxonomy>\r
                                                       <clade>\r
                                                         <taxonomy>\r
-                                                          <id provider="uniprot">143999</id>\r
-                                                          <scientific_name>Attini</scientific_name>\r
-                                                          <rank>tribe</rank>\r
+                                                          <id provider="uniprot">12957</id>\r
+                                                          <code>ATTCE</code>\r
+                                                          <scientific_name>Atta cephalotes</scientific_name>\r
+                                                          <authority>Linnaeus, 1758</authority>\r
+                                                          <common_name>Leafcutter ant</common_name>\r
+                                                          <rank>species</rank>\r
+                                                          <uri>http://upload.wikimedia.org/wikipedia/commons/4/4e/Leaf-cutting_ant.jpg</uri>\r
                                                         </taxonomy>\r
-                                                        <clade>\r
-                                                          <taxonomy>\r
-                                                            <id provider="uniprot">12957</id>\r
-                                                            <code>ATTCE</code>\r
-                                                            <scientific_name>Atta cephalotes</scientific_name>\r
-                                                            <authority>Linnaeus, 1758</authority>\r
-                                                            <common_name>Leafcutter ant</common_name>\r
-                                                            <rank>species</rank>\r
-                                                            <uri>http://upload.wikimedia.org/wikipedia/commons/4/4e/Leaf-cutting_ant.jpg</uri>\r
-                                                          </taxonomy>\r
-                                                        </clade>\r
-                                                        <clade>\r
-                                                          <taxonomy>\r
-                                                            <id provider="uniprot">103372</id>\r
-                                                            <code>ACREC</code>\r
-                                                            <scientific_name>Acromyrmex echinatior</scientific_name>\r
-                                                            <authority>Forel, 1899</authority>\r
-                                                            <common_name>Panamanian leafcutter ant</common_name>\r
-                                                            <synonym>Acromyrmex octospinosus echinatior</synonym>\r
-                                                            <rank>species</rank>\r
-                                                            <uri>http://hymenopteragenome.org/acromyrmex/sites/hymenopteragenome.org.acromyrmex/files/Acromyrmex_echinatior2.jpg</uri>\r
-                                                          </taxonomy>\r
-                                                        </clade>\r
                                                       </clade>\r
                                                       <clade>\r
                                                         <taxonomy>\r
-                                                          <id provider="uniprot">104421</id>\r
-                                                          <code>CAMFO</code>\r
-                                                          <scientific_name>Camponotus floridanus</scientific_name>\r
-                                                          <authority>Buckley, 1866</authority>\r
-                                                          <common_name>Florida carpenter ant</common_name>\r
+                                                          <id provider="uniprot">103372</id>\r
+                                                          <code>ACREC</code>\r
+                                                          <scientific_name>Acromyrmex echinatior</scientific_name>\r
+                                                          <authority>Forel, 1899</authority>\r
+                                                          <common_name>Panamanian leafcutter ant</common_name>\r
+                                                          <synonym>Acromyrmex octospinosus echinatior</synonym>\r
                                                           <rank>species</rank>\r
-                                                          <uri>http://bugguide.net/images/cache/5RLH6RRHXRALZZ9LZZ6L3LBLXZBL2RFZHZ9L7ZKH4RDZ3L3Z2RZHKZCLMZKH4R0H6R3Z6RSHMZBL5RRH5ROLKZELLZ.jpg</uri>\r
+                                                          <uri>http://hymenopteragenome.org/acromyrmex/sites/hymenopteragenome.org.acromyrmex/files/Acromyrmex_echinatior2.jpg</uri>\r
                                                         </taxonomy>\r
                                                       </clade>\r
                                                     </clade>\r
                                                     <clade>\r
                                                       <taxonomy>\r
-                                                        <id provider="uniprot">7460</id>\r
-                                                        <code>APIME</code>\r
-                                                        <scientific_name>Apis mellifera</scientific_name>\r
-                                                        <common_name>Honeybee</common_name>\r
+                                                        <id provider="uniprot">104421</id>\r
+                                                        <code>CAMFO</code>\r
+                                                        <scientific_name>Camponotus floridanus</scientific_name>\r
+                                                        <authority>Buckley, 1866</authority>\r
+                                                        <common_name>Florida carpenter ant</common_name>\r
                                                         <rank>species</rank>\r
-                                                        <uri>http://www.floridanature.org/photos/Apis_mellifera_6b_&amp;_Trifolium_sp.,_TBP,_Tallahassee,_20030323.jpg</uri>\r
+                                                        <uri>http://bugguide.net/images/cache/5RLH6RRHXRALZZ9LZZ6L3LBLXZBL2RFZHZ9L7ZKH4RDZ3L3Z2RZHKZCLMZKH4R0H6R3Z6RSHMZBL5RRH5ROLKZELLZ.jpg</uri>\r
                                                       </taxonomy>\r
                                                     </clade>\r
                                                   </clade>\r
                                                   <clade>\r
                                                     <taxonomy>\r
-                                                      <id provider="uniprot">7425</id>\r
-                                                      <code>NASVI</code>\r
-                                                      <scientific_name>Nasonia vitripennis</scientific_name>\r
-                                                      <common_name>Parasitic wasp</common_name>\r
+                                                      <id provider="uniprot">7460</id>\r
+                                                      <code>APIME</code>\r
+                                                      <scientific_name>Apis mellifera</scientific_name>\r
+                                                      <common_name>Honeybee</common_name>\r
                                                       <rank>species</rank>\r
-                                                      <uri>http://www.freshpond.org/nasonia.jpg</uri>\r
+                                                      <uri>http://www.floridanature.org/photos/Apis_mellifera_6b_&amp;_Trifolium_sp.,_TBP,_Tallahassee,_20030323.jpg</uri>\r
                                                     </taxonomy>\r
                                                   </clade>\r
                                                 </clade>\r
+                                                <clade>\r
+                                                  <taxonomy>\r
+                                                    <id provider="uniprot">7425</id>\r
+                                                    <code>NASVI</code>\r
+                                                    <scientific_name>Nasonia vitripennis</scientific_name>\r
+                                                    <common_name>Parasitic wasp</common_name>\r
+                                                    <rank>species</rank>\r
+                                                    <uri>http://www.freshpond.org/nasonia.jpg</uri>\r
+                                                  </taxonomy>\r
+                                                </clade>\r
                                               </clade>\r
                                               <clade>\r
                                                 <taxonomy>\r
-                                                  <id provider="uniprot">7070</id>\r
-                                                  <code>TRICA</code>\r
-                                                  <scientific_name>Tribolium castaneum</scientific_name>\r
-                                                  <common_name>Red flour beetle</common_name>\r
-                                                  <rank>species</rank>\r
-                                                  <uri>http://upload.wikimedia.org/wikipedia/commons/d/da/Tribolium_castaneum.jpg</uri>\r
+                                                  <id provider="uniprot">33341</id>\r
+                                                  <scientific_name>Orthopteroidea</scientific_name>\r
+                                                  <rank>infraclass</rank>\r
                                                 </taxonomy>\r
+                                                <clade>\r
+                                                  <taxonomy>\r
+                                                    <id provider="uniprot">6970</id>\r
+                                                    <scientific_name>Dictyoptera</scientific_name>\r
+                                                    <rank>superorder</rank>\r
+                                                  </taxonomy>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">6973</id>\r
+                                                      <code>BLAGE</code>\r
+                                                      <scientific_name>Blattella germanica</scientific_name>\r
+                                                      <common_name>German cockroach</common_name>\r
+                                                      <synonym>Blatta germanica</synonym>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://www.biopix.com/photosmedium/Blattella%20germanica%2000017.JPG</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">136037</id>\r
+                                                      <code>ZOONE</code>\r
+                                                      <scientific_name>Zootermopsis nevadensis</scientific_name>\r
+                                                      <common_name>Dampwood termite</common_name>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://bugguide.net/images/cache/GQA0PQ10VQPK4KAKRKWKSKEKLKWKPQZS5KBK1QCK7KJ05KOK8KAKRK9K4QUK6Q10RKWKHKT02QWKSKEK5Q9KPQD0PQ.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                </clade>\r
+                                                <clade>\r
+                                                  <taxonomy>\r
+                                                    <id provider="uniprot">6993</id>\r
+                                                    <scientific_name>Orthoptera</scientific_name>\r
+                                                    <rank>order</rank>\r
+                                                  </taxonomy>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">7009</id>\r
+                                                      <code>SCHAM</code>\r
+                                                      <scientific_name>Schistocerca americana</scientific_name>\r
+                                                      <common_name>American grasshopper</common_name>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://bugguide.net/images/cache/BH7HOHIHZRZLAZXLVZQL4ZKL4Z4H6Z4HRRNHLR5HZR2HAHGHAHSLAHKL1H7HDH7H3HUH1ZXLUZGL3H2HAHZLAHXH.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">51074</id>\r
+                                                      <code>GRYPE</code>\r
+                                                      <scientific_name>Gryllus pennsylvanicus</scientific_name>\r
+                                                      <common_name>Field cricket</common_name>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://bugguide.net/images/raw/GL9Z5L9Z8LJHWHHR6HRREHVZUHCHIH8Z7HVHMHGZ7HTHQL6ZXHOHWH3H5LUZ7L9ZRLVH5HDHQL.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                </clade>\r
                                               </clade>\r
                                             </clade>\r
                                             <clade>\r
@@ -1947,6 +2036,32 @@
                                                 </taxonomy>\r
                                                 <clade>\r
                                                   <taxonomy>\r
+                                                    <id provider="uniprot">33351</id>\r
+                                                    <scientific_name>Panheteroptera</scientific_name>\r
+                                                  </taxonomy>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">7536</id>\r
+                                                      <code>ONCFA</code>\r
+                                                      <scientific_name>Oncopeltus fasciatus</scientific_name>\r
+                                                      <common_name>Large milkweed bug</common_name>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://bugguide.net/images/cache/309QLSWQT0IKUKSK2KSKUKRKUKGKBKRKNK6QD05QC05Q6KZKPKGQD00K9KGQ2KLKWK8QV0KKO0EQV0EQNK8Q2KGQ10.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                  <clade>\r
+                                                    <taxonomy>\r
+                                                      <id provider="uniprot">13249</id>\r
+                                                      <code>RHOPR</code>\r
+                                                      <scientific_name>Rhodnius prolixus</scientific_name>\r
+                                                      <common_name>Triatomid bug</common_name>\r
+                                                      <rank>species</rank>\r
+                                                      <uri>http://upload.wikimedia.org/wikipedia/commons/b/b9/Rhodnius_prolixus.jpg</uri>\r
+                                                    </taxonomy>\r
+                                                  </clade>\r
+                                                </clade>\r
+                                                <clade>\r
+                                                  <taxonomy>\r
                                                     <id provider="uniprot">7029</id>\r
                                                     <code>ACYPI</code>\r
                                                     <scientific_name>Acyrthosiphon pisum</scientific_name>\r
@@ -1955,16 +2070,6 @@
                                                     <uri>http://www.agroatlas.ru/content/pests/Acyrthosiphon_pisum/Acyrthosiphon_pisum.jpg</uri>\r
                                                   </taxonomy>\r
                                                 </clade>\r
-                                                <clade>\r
-                                                  <taxonomy>\r
-                                                    <id provider="uniprot">13249</id>\r
-                                                    <code>RHOPR</code>\r
-                                                    <scientific_name>Rhodnius prolixus</scientific_name>\r
-                                                    <common_name>Triatomid bug</common_name>\r
-                                                    <rank>species</rank>\r
-                                                    <uri>http://upload.wikimedia.org/wikipedia/commons/b/b9/Rhodnius_prolixus.jpg</uri>\r
-                                                  </taxonomy>\r
-                                                </clade>\r
                                               </clade>\r
                                               <clade>\r
                                                 <taxonomy>\r