Merge pull request #158 from donmendelson/v1.1datatypes

V1.1datatypes
FIXTradingCommunity · Mar 24, 2022 · af317c9 · af317c9
2 parents a34c35f + e468b70
commit af317c9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/repository/src/main/resources/xsd/repository.xsd b/repository/src/main/resources/xsd/repository.xsd
@@ -115,7 +115,16 @@
 				<xs:element name="annotation" type="fixr:annotation" minOccurs="0"/>
 			</xs:sequence>
 			<xs:attribute name="name" type="fixr:Name_t" use="required"/>
-			<xs:attribute name="scenario" type="fixr:Name_t" default="base"/>
+			<xs:attribute name="scenario" type="fixr:Name_t" default="base">
+				<xs:annotation>
+					<xs:documentation>The use case of a datatype by name</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+			<xs:attribute name="scenarioId" type="fixr:id_t" default="1">
+				<xs:annotation>
+					<xs:documentation>Unique identifier of a scenario. Default is '1' for base scenario.</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
 			<xs:attribute name="baseType" type="fixr:Name_t"/>
 			<xs:attributeGroup ref="fixr:entityAttribGrp"/>
 		</xs:complexType>
@@ -128,6 +137,11 @@
 			</xs:sequence>
 			<xs:attribute ref="xml:base"/>
 		</xs:complexType>
+		<xs:key name="datatypeKey">
+			<xs:selector xpath="fixr:datatype"/>
+			<xs:field xpath="@name"/>
+			<xs:field xpath="@scenarioId"/>
+		</xs:key>
 	</xs:element>
 	<xs:element name="fields">
 		<xs:complexType>
@@ -166,7 +180,7 @@
 			<xs:selector xpath="fixr:group"/>
 			<xs:field xpath="@id"/>
 			<xs:field xpath="@scenarioId"/>
-		</xs:key>	
+		</xs:key>
 	</xs:element>
 	<xs:element name="messages">
 		<xs:complexType>
@@ -239,12 +253,12 @@
 		<xs:key name="typeKey">
 			<xs:selector xpath="fixr:codeSets/fixr:codeSet|fixr:datatypes/fixr:datatype"/>
 			<xs:field xpath="@name"/>
-			<xs:field xpath="@scenario"/>
+			<xs:field xpath="@scenarioId"/>
 		</xs:key>
 		<xs:keyref name="typeKeyref" refer="fixr:typeKey">
 			<xs:selector xpath="fixr:fields/fixr:field"/>
 			<xs:field xpath="@type"/>
-			<xs:field xpath="@scenario"/>
+			<xs:field xpath="@scenarioId"/>
 		</xs:keyref>
 		<xs:key name="scenarioNameKey">
 			<xs:selector xpath="fixr:scenarios/fixr:scenario"/>
@@ -258,6 +272,10 @@
 			<xs:selector xpath="fixr:codeSet"/>
 			<xs:field xpath="@scenarioId"/>
 		</xs:keyref>
+		<xs:keyref name="datatypeScenarioKeyRef" refer="fixr:scenarioIdKey">
+			<xs:selector xpath="fixr:datatype"/>
+			<xs:field xpath="@scenarioId"/>
+		</xs:keyref>
 		<xs:keyref name="componentScenarioKeyRef" refer="fixr:scenarioIdKey">
 			<xs:selector xpath="fixr:component"/>
 			<xs:field xpath="@scenarioId"/>
@@ -269,7 +287,7 @@
 		<xs:keyref name="messageScenarioKeyRef" refer="fixr:scenarioIdKey">
 			<xs:selector xpath="fixr:message"/>
 			<xs:field xpath="@scenarioId"/>
-		</xs:keyref>	
+		</xs:keyref>
 	</xs:element>
 	<xs:element name="scenarios">
 		<xs:annotation>

diff --git a/repository/src/test/resources/examples/mit_2016.xml b/repository/src/test/resources/examples/mit_2016.xml