mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 140
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Thu 2011-05-05 08:10:32 -0500
message:
  Bug #776431 
modified:
  schemas/constraint.xsd
  schemas/support.xsd


--
lp:mlhim-specs
https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main

Your team MLHIM Specifications Developers is subscribed to branch lp:mlhim-specs.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main/+edit-subscription

=== modified file 'schemas/constraint.xsd'
--- schemas/constraint.xsd	2011-05-02 19:23:29 +0000
+++ schemas/constraint.xsd	2011-05-05 13:10:32 +0000
@@ -2,6 +2,19 @@
 <!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
 <xs:schema elementFormDefault="qualified" id="constraint" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.1.1" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
  
+           <xs:complexType name="OntologyEntry" abstract="false">
+           <xs:annotation><xs:documentation>
+           A set of optional entries for a specific node or nodes in this CCD.  
+           </xs:documentation></xs:annotation>
+           <xs:sequence>
+               <xs:element name="contents" maxOccurs="unbounded" minOccurs="1" type="xs:string">
+                <xs:annotation><xs:documentation>A list of strings for this entry.</xs:documentation></xs:annotation>
+                </xs:element>           
+           </xs:sequence>
+           </xs:complexType>
+           
+           
+           
            <xs:complexType name="Ontology" abstract="false">
 	<xs:annotation>
 	<xs:documentation>
@@ -11,23 +24,27 @@
 	</xs:annotation>
              <xs:sequence>
  
-               <xs:element name="names" maxOccurs="unbounded" minOccurs="1" type="xs:string">
+               <xs:element name="names" maxOccurs="unbounded" minOccurs="0" type="xs:string">
                 <xs:annotation><xs:documentation>Contains the list of 'name' attributes in the CCD;in the original language. They are connected to the name points in the CCD via a uuid. This allows translations using the uuid as the GETTEXT msgid. </xs:documentation></xs:annotation>
                 </xs:element>
 
  
-               <xs:element name="internalVocabularies" maxOccurs="unbounded" minOccurs="1" type="xs:string">
+               <xs:element name="internalVocabularies" maxOccurs="unbounded" minOccurs="0" type="xs:string">
                 <xs:annotation><xs:documentation>Internal vocabularies useful for options such as DvText.dv  The DvText.dv attribute will contain the uuid link to the named element.  This element will contain the options.  </xs:documentation></xs:annotation>
                 </xs:element>
                
-               <xs:element name="lookupTables" maxOccurs="unbounded" minOccurs="1" type="xs:string">
+               <xs:element name="lookupTables" maxOccurs="unbounded" minOccurs="0" type="xs:string">
                 <xs:annotation><xs:documentation>Lookup tables used for data points in the CCD.  Such as DvText.dv options.  These tables may be in a variety of formats such as csv. Therefore the implementation will have to handle how this table is handled. </xs:documentation></xs:annotation>
                 </xs:element>
                
  
-               <xs:element name="terminologies" maxOccurs="unbounded" minOccurs="1" type="xs:string">
+               <xs:element name="terminologies" maxOccurs="unbounded" minOccurs="0" type="xs:string">
                 <xs:annotation><xs:documentation>References to teminology entries.</xs:documentation></xs:annotation>
                 </xs:element>
+
+               <xs:element name="generalEntries" maxOccurs="unbounded" minOccurs="0" type="mlhim2:OntologyEntry">
+                <xs:annotation><xs:documentation>A list of general Ontology Entries that do not fit into one of the predefined categories.</xs:documentation></xs:annotation>
+                </xs:element>
                
              </xs:sequence>
            </xs:complexType>

=== modified file 'schemas/support.xsd'
--- schemas/support.xsd	2011-04-30 23:28:31 +0000
+++ schemas/support.xsd	2011-05-05 13:10:32 +0000
@@ -34,7 +34,7 @@
 	<xs:complexType name="MSK">
 	<xs:annotation>
 	<xs:documentation>
-	There is inforamtion on this item available but it has not been provided by the sender due to security, privacy or other reasons. 
+	There is information on this item available but it has not been provided by the sender due to security, privacy or other reasons. 
 	There may be an alternate method of obtaining the information.	
 	</xs:documentation>
 	</xs:annotation>
@@ -46,7 +46,7 @@
 	<xs:complexType name="NA">
 	<xs:annotation>
 	<xs:documentation>
-	No proper value is applicable in this context e.g.,the number of cigarrettes smoked per day by a non-smoker subject.
+	No proper value is applicable in this context e.g.,the number of cigarettes smoked per day by a non-smoker subject.
 	</xs:documentation>
 	</xs:annotation>
 	  <xs:complexContent>