fixes #141 Removed EntitySynopsis, augmenting URIAndEntityName with t…

…he designation attribute
cts2 · Feb 27, 2013 · c0b1523 · c0b1523
1 parent 254a034
commit c0b1523
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/association/Association.xsd b/association/Association.xsd
@@ -294,7 +294,7 @@
 		<xs:complexContent>
 			<xs:extension base="AssociationDirectoryEntry">
 				<xs:sequence>
-					<xs:element name="nodeEntity" type="core:EntitySynopsis" minOccurs="1">
+					<xs:element name="nodeEntity" type="core:URIAndEntityName" minOccurs="1">
 						<xs:annotation>
 							<xs:documentation>the URI, name and a designation for the <i>EntityReference</i> represented by this node. <i>nodeEntity</i> represents the association <i>subject</i> when <i>direction</i> is
 									<i>SOURCE_TO_TARGET</i> and (one of the) targets when <i>direction</i> is <i>TARGET_TO_SOURCE.</i></xs:documentation>

diff --git a/core/Core.xsd b/core/Core.xsd
@@ -665,23 +665,6 @@
 	<!-- ===============================================
 		EntityReference
 		=============================================== -->
-	<xs:complexType name="EntitySynopsis">
-		<xs:annotation>
-			<xs:documentation>The URI, local namespace and name and optional designation of an <i>EntityDescription</i>. <i>EntitySynopsis</i> represents entities when they are referenced from the context of a single code system, such as
-				the resolution of value sets and association graphs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="URIAndEntityName">
-				<xs:sequence>
-					<xs:element name="designation" type="String" minOccurs="0" maxOccurs="1">
-						<xs:annotation>
-							<xs:documentation>a designation considered appropriate for the entity in the specific context of use</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
 
 	<xs:complexType name="EntityReference">
 		<xs:annotation>
@@ -825,19 +808,24 @@
 
 	<xs:complexType name="URIAndEntityName">
 		<xs:annotation>
-			<xs:documentation>The combination of a URI and/or and ScopedEntityName. </xs:documentation>
+			<xs:documentation>The combination of a URI and an optional ScopedEntityName and an optional designation for a resource. </xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
 			<xs:element name="namespace" type="NamespaceIdentifier" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>an identifier that references a unique namespace URI within the context of the service</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="name" type="String" minOccurs="0">
+			<xs:element name="name" type="String" minOccurs="0" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>the local entity name within the context of the namespace. What is chosen for the entity name is service specific</xs:documentation>
 				</xs:annotation>
 			</xs:element>
+			<xs:element name="designation" type="String" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>a designation considered appropriate for the entity in the specific context of use</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="uri" type="ExternalURI" use="required">
 			<xs:annotation>

diff --git a/valuesetdefinition/ValueSetDefinition.xsd b/valuesetdefinition/ValueSetDefinition.xsd
@@ -413,7 +413,7 @@
 							CTS<sub>2</sub> service instance that contains all of the necessary definitions and code system versions.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="member" type="core:EntitySynopsis" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="member" type="core:URIAndEntityName" minOccurs="0" maxOccurs="unbounded">
 				<xs:annotation>
 					<xs:documentation>a synopsis of the <i>EntityDescription</i> that has been determined to be a member of the value set named in <i>resolutionInfo</i> according to the stated criteria or "bindings"</xs:documentation>
 				</xs:annotation>
@@ -438,7 +438,7 @@
 									CTS<sub>2</sub> service instance that contains all of the necessary definitions and code system versions.</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="entry" type="core:EntitySynopsis" minOccurs="0" maxOccurs="unbounded">
+					<xs:element name="entry" type="core:URIAndEntityName" minOccurs="0" maxOccurs="unbounded">
 						<xs:annotation>
 							<xs:documentation>a synopsis of the <i>EntityDescription</i> that has been determined to be a member of the value set named in <i>resolutionInfo</i> according to the stated criteria or "bindings"</xs:documentation>
 						</xs:annotation>