X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Funiprot_mapping.xml;h=63de78e69f32ba8e01291cd6efa8d519b684ad54;hb=6efabb12ac7f2ed3bb6bb9e47505cf0112784837;hp=697c90ca4c452efc29be0e554ba2a9045bca030f;hpb=a8def57620fc5dbf692011cbffaea54f10e6697b;p=jalview.git

diff --git a/resources/uniprot_mapping.xml b/resources/uniprot_mapping.xml
index 697c90c..63de78e 100755
--- a/resources/uniprot_mapping.xml
+++ b/resources/uniprot_mapping.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Object Mapping DTD Version 1.0//EN" "http://castor.exolab.org/mapping.dtd">
 <mapping>
 	<class name="jalview.datamodel.UniprotFile">
                  <map-to xml="uniprot"/>               
@@ -9,27 +8,31 @@
         </class>
 		 
 	 <class name="jalview.datamodel.UniprotEntry">
-	      <field name="name" type="string" collection="vector"/>
-	      <field name="accession" type="string" collection="vector"/>
+	 	<field name="accession" type="string" collection="vector"/>
+	      	<field name="name" type="string" collection="vector"/>
+	      	<field name="proteinName" type="string" collection="vector">
+	      		<bind-xml name="name" location="protein"/>
+	      	</field>
+	      	
+	      
 	      <field name="UniprotSequence" type="jalview.datamodel.UniprotSequence">
 	      	<bind-xml name="sequence"/> 
 	       </field>
-	       <field name="features" type="jalview.datamodel.SequenceFeature" collection="vector">
-	       	  <bind-xml name="feature"/>
-	       </field>
-	       
+	       <field name="feature" type="jalview.datamodel.SequenceFeature" collection="vector"/>
+	       <field name="dbReference" type="jalview.datamodel.PDBEntry" collection="vector"/>
+	   	       
 	 </class>
 	 
 	 
 	 <class name="jalview.datamodel.SequenceFeature">
 	 	<field name="type">
-	 		<bind-xml name="type" node="attribute"/>
+	 		<bind-xml node="attribute"/>
 	 	</field>
 	 	<field name="description">
-			 <bind-xml name="description" node="attribute"/>
+			 <bind-xml node="attribute"/>
 	 	</field>
 	 	<field name="status">
-			<bind-xml name="status" node="attribute"/>
+			<bind-xml node="attribute"/>
 	 	</field>
 	 	<field name="position">
 	 	 <bind-xml name="position" node="attribute" location="location/position"/>
@@ -47,5 +50,22 @@
 		        <bind-xml name="sequence" node="text"/>
 		     </field>
 	 </class>
+	 
+	 <class name="jalview.datamodel.PDBEntry">
+	 	<field name="type"><bind-xml node="attribute"/></field>
+	 	<field name="id"><bind-xml node="attribute"/></field>
+	 	<field name="property" collection="hashtable">
+			<bind-xml name="property">
+			   <class name="org.exolab.castor.mapping.MapItem">
+			      <field name="key">
+				<bind-xml name="type" node="attribute"/>
+			      </field>
+			      <field name="value">
+			      	<bind-xml node="attribute"/>
+			      	</field>
+			   </class>
+			</bind-xml>
+		</field>
+	 </class>
 
 </mapping>