X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Fembl_mapping.xml;h=3b80821d4e4972fa6d04dc9836eb6fffbdb00a16;hb=6a2c35d5cde338e1eb9ee851f2a5a7a00ddee819;hp=41ee304caa5f317bed5d2f5c7a9ebe95a8e594e4;hpb=5071850e8470077a8ac2bdc6a53908c70ad5526d;p=jalview.git

diff --git a/resources/embl_mapping.xml b/resources/embl_mapping.xml
index 41ee304..3b80821 100644
--- a/resources/embl_mapping.xml
+++ b/resources/embl_mapping.xml
@@ -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="rLastUpdated" type="string">
-			<bind-xml name="releaseLastUpdated" node="attribute"/>
+		<field name="firstPublicRelease" type="string">
+			<bind-xml name="firstPublicRelease" node="attribute"/>
 		</field>
-		<field name="desc" type="string">
+		<field name="lastUpdatedDate" type="string">
+			<bind-xml name="lastUpdated" node="attribute"/>
+		</field>
+		<field name="lastUpdatedRelease" type="string">
+			<bind-xml name="lastUpdatedRelease" node="attribute"/>
+		</field>
+		<field name="description" type="string">
 			<bind-xml name="description" node="element"/>
 		</field>
 		<field name="keywords" type="string" collection="vector">
@@ -124,40 +136,4 @@
 			<bind-xml name="value" node="element"/>
 		</field>
 	</class>
-	<class name="jalview.datamodel.xdb.embl.EmblFeatureLocations">
-		<field name="locationType" type="string">
-			<bind-xml name="type" node="attribute"/>
-		</field>
-		<field name="locationComplement" type="boolean">
-			<bind-xml name="complement" node="attribute"/>
-		</field>
-		<field name="locElements" type="jalview.datamodel.xdb.embl.EmblFeatureLocElement" collection="vector">
-			<bind-xml name="locationElement"/>
-		</field>
-	</class>
-	<class name="jalview.datamodel.xdb.embl.EmblFeatureLocElement">
-		<field name="type" type="string">
-			<bind-xml name="type" node="attribute"/>
-		</field>
-		<field name="accession" type="string">
-			<bind-xml name="accession" node="attribute"/>			
-		</field>
-		<field name="version" type="string">
-			<bind-xml name="version" node="attribute"/>
-		</field>
-		<field name="complement" type="boolean">
-			<bind-xml name="complement"/>
-		</field>
-		<field name="basePositions" type="jalview.datamodel.xdb.embl.BasePosition" collection="array">
-			<bind-xml name="basePosition" node="element"/>
-		</field>
-	</class>
-	<class name="jalview.datamodel.xdb.embl.BasePosition">
-		<field name="type">
-			<bind-xml name="type" node="attribute"/>
-		</field>
-		<field name="pos">
-			<bind-xml node="text"/>
-		</field>
-	</class>
 </mapping>