From 6341fc75e1c9b1c8f0a84a6a962c2d0d436f9bd3 Mon Sep 17 00:00:00 2001
From: Don Mendelson <donmendelson@gmail.com>
Date: Thu, 22 Sep 2022 09:03:17 -0500
Subject: [PATCH] [repository schema] Field type attribute does not distinguish
 between datatype and code set reference #170 Note: Sample file does not pass
 validation due to schema changes.

---
 .../src/main/resources/xsd/repository.xsd     | 23 +++++++++++++++----
 .../main/resources/xsd/repositorytypes.xsd    | 13 +++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/repository/src/main/resources/xsd/repository.xsd b/repository/src/main/resources/xsd/repository.xsd
index a14bc907..80f0e8de 100644
--- a/repository/src/main/resources/xsd/repository.xsd
+++ b/repository/src/main/resources/xsd/repository.xsd
@@ -146,7 +146,12 @@
 	<xs:element name="fields">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="field" type="fixr:fieldType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="field" type="fixr:fieldType" minOccurs="0" maxOccurs="unbounded">
+					<xs:key name="typeKey">
+						<xs:selector xpath="."/>
+						<xs:field xpath="@type|@codeSet"/>
+					</xs:key>
+				</xs:element>
 				<xs:element name="annotation" type="fixr:annotation" minOccurs="0"/>
 			</xs:sequence>
 			<xs:attribute name="latestEP" type="fixr:EP_t"/>
@@ -250,16 +255,26 @@
 				</xs:annotation>
 			</xs:attribute>
 		</xs:complexType>
-		<xs:key name="typeKey">
-			<xs:selector xpath="fixr:codeSets/fixr:codeSet|fixr:datatypes/fixr:datatype"/>
+		<xs:key name="datatypeRefKey">
+			<xs:selector xpath="fixr:datatypes/fixr:datatype"/>
 			<xs:field xpath="@name"/>
 			<xs:field xpath="@scenarioId"/>
 		</xs:key>
-		<xs:keyref name="typeKeyref" refer="fixr:typeKey">
+		<xs:keyref name="typeKeyref" refer="fixr:datatypeRefKey">
 			<xs:selector xpath="fixr:fields/fixr:field"/>
 			<xs:field xpath="@type"/>
 			<xs:field xpath="@scenarioId"/>
 		</xs:keyref>
+		<xs:key name="codesetRefKey">
+			<xs:selector xpath="fixr:codeSets/fixr:codeSet"/>
+			<xs:field xpath="@name"/>
+			<xs:field xpath="@scenarioId"/>
+		</xs:key>
+		<xs:keyref name="codesetKeyref" refer="fixr:codesetRefKey">
+			<xs:selector xpath="fixr:fields/fixr:field"/>
+			<xs:field xpath="@codeSet"/>
+			<xs:field xpath="@scenarioId"/>
+		</xs:keyref>
 		<xs:key name="scenarioNameKey">
 			<xs:selector xpath="fixr:scenarios/fixr:scenario"/>
 			<xs:field xpath="@name"/>
diff --git a/repository/src/main/resources/xsd/repositorytypes.xsd b/repository/src/main/resources/xsd/repositorytypes.xsd
index 73bedf4f..5d83dcfc 100644
--- a/repository/src/main/resources/xsd/repositorytypes.xsd
+++ b/repository/src/main/resources/xsd/repositorytypes.xsd
@@ -455,7 +455,7 @@
 				<xs:documentation>Name of this rule</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="type" type="xs:string">
+		<xs:attribute name="type" type="fixr:Name_t">
 			<xs:annotation>
 				<xs:documentation>Overrides the type of the referenced field.
 				</xs:documentation>
@@ -484,10 +484,15 @@
 		</xs:sequence>
 		<xs:attributeGroup ref="fixr:oidGrp"/>
 		<xs:attributeGroup ref="fixr:entityAttribGrp"/>
-		<xs:attribute name="type" type="xs:string" use="required">
+		<xs:attribute name="type" type="fixr:Name_t">
 			<xs:annotation>
-				<xs:documentation>Attribute type refers to either a datatype or a
-					codeSet, which carries an underlying datatype.
+				<xs:documentation>Attribute type refers to a datatype name
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="codeSet" type="fixr:Name_t">
+			<xs:annotation>
+				<xs:documentation>Attribute codeSet refers to a codeSet name
 				</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>