CodeValue updates

CompositeTypes/CodeValueType/CodeValueType.csv

@@ -1,9 +1,6 @@
 Name,DataType,MinCardinality,MaxCardinality,Description,Ordered,AllowSubtypes,MinLength,MaxLength,Enumeration,Pattern,MinInclusive,MinExclusive,MaxInclusive,MaxExclusive,DeprecatedNamespace,DeprecatedElementOrAttribute,DeprecatedChoiceGroup
-StringValue,string,0,1,,,,,,,,,,,,,,
-ControlledVocabularyID,string,0,1,The ID of the controlled vocabulary that the content was taken from.,,,,,,,,,,,,a,
-ControlledVocabularyName,string,0,1,The name of the controlled vocabulary.,,,,,,,,,,,,a,
-ControlledVocabularyAgencyName,string,0,1,The name of the agency maintaining the controlled vocabulary.,,,,,,,,,,,,a,
-ControlledVocabularyVersionID,string,0,1,The version number of the controlled vocabulary.,,,,,,,,,,,,a,
-OtherValue,string,0,1,"If the value of the string is ""Other"" or the equivalent from the controlled vocabulary, this attribute can provide a more specific value not found in the controlled vocabulary.",,,,,,,,,,,,a,
-ControlledVocabularyURN,string,0,1,The URN of the controlled vocabulary.,,,,,,,,,,,,a,
-ControlledVocabularySchemeURN,string,0,1,"If maintained within a scheme, the URN of the scheme containing the controlled vocabulary.",,,,,,,,,,,,a,
+StringValue,string,0,1,The code term as it appears in the controlled vocabulary,,,,,,,,,,,,,
+OtherValue,string,0,1,"If the value of the string is ""Other"" or the equivalent from the controlled vocabulary, this attribute can provide a more specific value not found in the controlled vocabulary.",,,,,,,,,,,,,
+ControlledVocabularyCodeListReference,CodeList,0,1,A DDI CodeList representation of the controlled vocabulary that the content was taken from.,,,,,,,,,,,,,
+ControlledVocabularyURI,string,0,1,"Specifies the URI location for the full controlled vocabulary, usually represented in an RDF SKOS or XKOS representation.",,,,,,,,,,,,,
+ControlledVocabularyInstanceURI,string,0,1,"Specifies the identification URI of the term/code within the controlled vocabulary if available.",,,,,,,,,,,,,

CompositeTypes/DataFileVersionType/DataFileVersionType.csv

@@ -1,5 +1,5 @@
 Name,DataType,MinCardinality,MaxCardinality,Description,Ordered,AllowSubtypes,MinLength,MaxLength,Enumeration,Pattern,MinInclusive,MinExclusive,MaxInclusive,MaxExclusive,DeprecatedNamespace,DeprecatedElementOrAttribute,DeprecatedChoiceGroup
-TypeOfVersionNumber,string,0,1,"This is the name of the versioning scheme as defined by the user's system, in cases where the user's system employs more than one versioning scheme.",,,,,,,,,,,ddi:physicalinstance:3_3,e,
+TypeOfVersionNumber,CodeValueType,0,1,"This is the name of the versioning scheme as defined by the user's system, in cases where the user's system employs more than one versioning scheme.",,,,,,,,,,,ddi:physicalinstance:3_3,e,
 VersionResponsibility,string,0,1,"Person or organization within the MaintenanceAgency responsible for the version change. If it is important to retain the affiliation between and individual responsible for the version and his/her agency, it may be included in this notation. This is primarily intended for internal use.",,,,,,,,,,,ddi:reusable:3_3,e,
 VersionResponsibilityReference,Agent,0,1,"Reference person or organization within the MaintenanceAgency responsible for the version change, as described in an OrganizationScheme. If it is important to retain the affiliation between and individual responsible for the version and his/her agency, a Relation should be created between the individual referenced here and his/her organization. This is primarily intended for internal use.",,true,,,,,,,,,ddi:reusable:3_3,e,
 VersionRationale,VersionRationaleType,0,1,Textual description of the rationale/purpose for a version change.,,,,,,,,,,,ddi:reusable:3_3,e,

CompositeTypes/UserIDType/UserIDType.csv

@@ -1,5 +1,5 @@
 Name,DataType,MinCardinality,MaxCardinality,Description,Ordered,AllowSubtypes,MinLength,MaxLength,Enumeration,Pattern,MinInclusive,MinExclusive,MaxInclusive,MaxExclusive,DeprecatedNamespace,DeprecatedElementOrAttribute,DeprecatedChoiceGroup
 StringValue,string,0,1,,,,,,,,,,,,,,
-TypeOfUserID,string,1,1,This is a required attribute containing the local user identification system that maintains and defines the UserID.,,,,,,,,,,,,a,
+TypeOfUserID,CodeValueType,1,1,This is a required attribute containing the local user identification system that maintains and defines the UserID.,,,,,,,,,,,,a,
 UserIDVersion,string,0,1,The UserID may designate the version number of the UserID. This is important in cases where the DDI identification system and the UserID system use different structures to record version numbers or if there is a difference between the DDI version number and the UserID's version number.,,,,,,,,,,,,a,
-TypeOfUserVersion,string,0,1,"This is the name of the versioning scheme as defined by the user's system, in cases where the user's system employs more than one versioning scheme. It is specific to the system identified by the typeOfUserID attribute",,,,,,,,,,,,a,
+TypeOfUserVersion,CodeValueType,0,1,"This is the name of the versioning scheme as defined by the user's system, in cases where the user's system employs more than one versioning scheme. It is specific to the system identified by the typeOfUserID attribute",,,,,,,,,,,,a,