X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Fembl_mapping.xml;h=3b80821d4e4972fa6d04dc9836eb6fffbdb00a16;hb=aa885913f06fc3885c818370544f43474a14f402;hp=12e25be9785e8b92e27532e8a445f451d755942e;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git

diff --git a/resources/embl_mapping.xml b/resources/embl_mapping.xml
index 12e25be..3b80821 100644
--- 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 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -22,35 +22,64 @@
 <!--
 	History: Originally created from EMBL_common_V1.0
 	Updated on 24th April 2007 for WsDBFetch Service move to EMBL_Services_V1.1.xsd
+	Updated May 2016 for EMBL XML 1.2 JAL-2113 JAL-2114
+	  see ftp://ftp.sra.ebi.ac.uk/meta/xsd/sra_1_5/ENA.embl.xsd
+	  see http://www.ebi.ac.uk/ena/submit/data-formats
 	-->
 	<class name="jalview.datamodel.xdb.embl.EmblFile">
-		<map-to xml="EMBL_Services"/>
+		<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>
-		
 		<field name="errors" type="jalview.datamodel.xdb.embl.EmblError" collection="vector">
 			<bind-xml name="Error"/>
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblEntry">
 		<field name="accession" type="string">
-			<bind-xml location="accession" node="attribute"/>
+			<bind-xml name="accession" node="attribute"/>
 		</field>
-		<!--  May 2015 changed from last-updated to match xml -->
-		<field name="lastUpdated" type="string">
-			<bind-xml location="lastUpdated" node="attribute"/>
+		<!-- 
+		    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"/>
 		</field>
-		<field name="version" type="string">
-			<bind-xml location="version" node="attribute"/>
+		<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>
+		<field name="sequenceLength" type="string">
+			<bind-xml name="sequenceLength" node="attribute"/>
+		</field>
+		<field name="topology" type="string">
+			<bind-xml name="topology" node="attribute" location="type"/>
 		</field>
-		<field name="rCreated" type="string">
-			<bind-xml location="releaseCreated" node="attribute"/>
+		<field name="firstPublicDate" type="string">
+			<bind-xml name="firstPublic" node="attribute"/>
 		</field>
-		<field name="rLastUpdated" type="string">
-			<bind-xml location="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">
@@ -60,19 +89,13 @@
 			<bind-xml name="feature"/>
 		</field>
 		<field name="dbRefs" type="jalview.datamodel.DBRefEntry" collection="vector">
-			<bind-xml name="dbreference" />
+			<bind-xml name="xref" />
 		</field>
 		<field name="sequence" type="jalview.datamodel.xdb.embl.EmblSequence">
 			<bind-xml name="sequence"/>
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblSequence">
-		<field name="type" type="string">
-			<bind-xml name="type" node="attribute" location="type"/>
-		</field>
-		<field name="version" type="string">
-			<bind-xml name="version" node="attribute" location="version"/>
-		</field>
 		<field name="sequence" type="string">
 			<bind-xml node="text"/>
 		</field>
@@ -81,25 +104,25 @@
 		<field name="name" type="string">
 			<bind-xml name="name" node="attribute"/>
 		</field>
+		<field name="location" type="string">
+			<bind-xml name="location" node="attribute"/>
+		</field>
 		<field name="dbRefs" type="jalview.datamodel.DBRefEntry" collection="vector">
-			<bind-xml name="dbreference" node="element"/>
+			<bind-xml name="xref" node="element"/>
 		</field>
 		<field name="qualifiers" type="jalview.datamodel.xdb.embl.Qualifier" collection="vector">
 			<bind-xml name="qualifier"/>
 		</field>					
-		<field name="locations" type="jalview.datamodel.xdb.embl.EmblFeatureLocations" collection="vector">
-			<bind-xml name="location"/>
-		</field>
 	</class>
 	<class name="jalview.datamodel.DBRefEntry" verify-constructable="false">
 		<field name="accessionId" type="java.lang.String">
-			<bind-xml name="primary" node="attribute"/>
+			<bind-xml name="id" node="attribute"/>
 		</field>
 		<field name="source" type="java.lang.String"> 
 			<bind-xml name="db" node="attribute"/>
 		</field>
 		<field name="version" type="string">
-			<bind-xml name="secondary" node="attribute"/>
+			<bind-xml name="secondaryId" node="attribute"/>
 		</field>
 	</class>
 	<class  name="jalview.datamodel.xdb.embl.Qualifier" verify-constructable="false">
@@ -113,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>