X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fvamsas.xsd;h=abfabb117344c24de767cc45f02a54baec4ed13e;hb=31c6e45ee34d7a9b531fc01a0da478b911f35570;hp=1de091817880367a5061586bd88bce7e0de9b935;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index 1de0918..abfabb1 100755
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * 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.
  * 
@@ -18,6 +18,11 @@
  * The Jalview Authors are detailed in the 'AUTHORS' file.
 -->
 <!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by ioh[ (o[ih[oh) -->
+<!-- 
+	Java JAXB binding classes are generated by running command line tool xjc:
+ 	    xjc schemas/jalview.xsd -d src -p jalview.xml.binding.jalview
+ 	Note this also generates code for included schemas
+-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vamsas="www.vamsas.ac.uk/jalview/version2" targetNamespace="www.vamsas.ac.uk/jalview/version2" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:complexType name="VAMSAS">
 		<xs:sequence>
@@ -98,6 +103,11 @@
 							</xs:element>
 						</xs:choice>
 					</xs:sequence>
+					<xs:attribute name="mappingType" type="xs:string" use="optional">
+						<xs:annotation>
+							<xs:documentation>Biotype of the mapping e.g. CdsToPeptide</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
 				</xs:extension>
 			</xs:complexContent>	
 		</xs:complexType>
@@ -156,6 +166,20 @@
 								<xs:attribute name="source" type="xs:string"/>
 								<xs:attribute name="version" type="xs:string"/>
 								<xs:attribute name="accessionId" type="xs:string"/>
+								<xs:attribute name="locus" type="xs:boolean" default="false">
+									<xs:annotation>
+										<xs:documentation>
+											true for gene locus mapping, source=species, version=assembly, accession=chromosome
+										</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+								<xs:attribute name="canonical" type="xs:boolean" default="false">
+									<xs:annotation>
+										<xs:documentation>
+											true for the representative accession for databases where multiple accessions map to the same entry (eg. Uniprot)
+										</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
 							</xs:complexType>
 						</xs:element>
 					</xs:sequence>
@@ -166,6 +190,13 @@
 							</xs:documentation>
 						</xs:annotation>
 					</xs:attribute>
+					<xs:attribute name="biotype" type="xs:string" use="optional">
+						<xs:annotation>
+							<xs:documentation>
+								Biotype of the sequence (if known)
+							</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
 				</xs:extension>
 			</xs:complexContent>
 		</xs:complexType>
@@ -185,12 +216,10 @@
 						<xs:attribute name="colour" type="xs:int" />
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string" />
-						<xs:attribute name="value" type="xs:string" />
-					</xs:complexType>
+				<xs:element name="contactmatrix" type="vamsas:MatrixType"
+					maxOccurs="unbounded" minOccurs="0">
 				</xs:element>
+				<xs:element name="property" type="vamsas:property" minOccurs="0" maxOccurs="unbounded"/>
 			</xs:sequence>
 			<xs:attribute name="graph" type="xs:boolean" use="required" />
 			<xs:attribute name="graphType" type="xs:int" use="optional" />
@@ -277,4 +306,49 @@
 		<xs:attribute name="id" type="xs:string"/>
 		<xs:attribute name="description" type="xs:string"/>
 	</xs:complexType>
+	<xs:complexType name="MatrixType">
+		<xs:sequence>
+			<xs:element name="elements" type="xs:string" minOccurs="1"
+				maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>serialised representation of matrix as one or
+						more sets of comma separated values</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="groups" type="xs:string" minOccurs="0"
+				maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Comma separated series of BigIntegers formed from
+						bitsets defining partitions on the rows/columns of the matrix
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="newick" type="xs:string" minOccurs="0"
+				maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>tree computed for this</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="property" type="vamsas:property"
+				minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+
+		<xs:attribute name="type" type="xs:string" use="required" />
+		<xs:attribute name="rows" type="xs:integer"
+			use="required" />
+		<xs:attribute name="cols" type="xs:integer"
+			use="required" />
+		<xs:attribute name="treeMethod" type="xs:string"
+			use="optional" />
+		<xs:attribute name="cutHeight" type="xs:double"
+			use="optional" />
+		<xs:attribute name="id" type="xs:string" use="optional" />
+
+	</xs:complexType>
+	<xs:complexType name="property">
+		<xs:attribute name="name" type="xs:string" />
+		<xs:attribute name="value" type="xs:string" />
+	</xs:complexType>
+				
+	
 </xs:schema>