Merge branch 'releases/Release_2_10_0_Branch'

[jalview.git] / resources / embl_mapping.xml

diff --git a/resources/embl_mapping.xml b/resources/embl_mapping.xml
index da1bba4..ae8376a 100644 (file)
--- a/resources/embl_mapping.xml
+++ b/resources/embl_mapping.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -28,6 +28,9 @@
        -->
        <class name="jalview.datamodel.xdb.embl.EmblFile">
                <map-to xml="ROOT"/>
+               <field name="text" type="string">
+                       <bind-xml node="text"/>
+               </field>
                <field name="entries" type="jalview.datamodel.xdb.embl.EmblEntry" collection="vector">
                        <bind-xml name="entry"/>
                </field>
@@ -39,12 +42,9 @@
                <field name="accession" type="string">
                        <bind-xml name="accession" node="attribute"/>
                </field>
-               <field name="lastUpdated" type="string">
-                       <bind-xml name="lastUpdated" node="attribute"/>
-               </field>
                <!-- 
-                   in EMBL XML 1.2 sequence/@version becomes entry/version 
-                   entry/@version becomes entry/@entryVersion
+                   in EMBL XML 1.2 sequence/@version became entry/version 
+                   entry/@version became entry/@entryVersion
                -->
                <field name="sequenceVersion" type="string">
                        <bind-xml name="version" node="attribute"/>
@@ -52,6 +52,12 @@
                <field name="entryVersion" type="string">
                        <bind-xml name="entryVersion" node="attribute"/>
                </field>
+               <field name="dataClass" type="string">
+                       <bind-xml name="dataClass" node="attribute"/>
+               </field>
+               <field name="taxonomicDivision" type="string">
+                       <bind-xml name="taxonomicDivision" node="attribute"/>
+               </field>
                <field name="moleculeType" type="string">
                        <bind-xml name="moleculeType" node="attribute"/>
                </field>
@@ -61,13 +67,19 @@
                <field name="topology" type="string">
                        <bind-xml name="topology" node="attribute" location="type"/>
                </field>
-               <field name="rCreated" type="string">
-                       <bind-xml name="releaseCreated" node="attribute"/>
+               <field name="firstPublicDate" type="string">
+                       <bind-xml name="firstPublic" node="attribute"/>
+               </field>
+               <field name="firstPublicRelease" type="string">
+                       <bind-xml name="firstPublicRelease" node="attribute"/>
+               </field>
+               <field name="lastUpdatedDate" type="string">
+                       <bind-xml name="lastUpdated" node="attribute"/>
                </field>
-               <field name="rLastUpdated" type="string">
-                       <bind-xml name="releaseLastUpdated" node="attribute"/>
+               <field name="lastUpdatedRelease" type="string">
+                       <bind-xml name="lastUpdatedRelease" node="attribute"/>
                </field>
-               <field name="desc" type="string">
+               <field name="description" type="string">
                        <bind-xml name="description" node="element"/>
                </field>
                <field name="keywords" type="string" collection="vector">