Changeset 207 for Xml/Working/ome.xsd

Timestamp:

09/22/08 14:23:50 (4 months ago)

Author:

andrew

Message:

Relax of schema as outlined in ChangesForSeptember?2008 on ome-xml.org

Files:

• Xml/Working/ome.xsd (modified) (10 diffs)

Xml/Working/ome.xsd

@@ -92 +92 @@
                 <xsd:complexType>
                         <xsd:sequence>
-                                <xsd:element ref="CreationDate" minOccurs="1" maxOccurs="1"/>
+                                <xsd:element ref="CreationDate" minOccurs="0" maxOccurs="1"/>
                                 <xsd:element ref="ExperimenterRef" minOccurs="0" maxOccurs="1"/>
                                 <xsd:element ref="Description" minOccurs="0" maxOccurs="1"/>
@@ -112 +112 @@
                         </xsd:sequence>
                         <xsd:attribute name="ID" use="required" type="ImageID"/>
-                        <xsd:attribute name="Name" use="required" type="xsd:string"/>
+                        <xsd:attribute name="Name" use="optional" type="xsd:string"/>
                         <xsd:attribute name="DefaultPixels" use="required" type="PixelsID">
                                 <xsd:annotation>
@@ -328 +328 @@
 
         <xsd:complexType name="PlaneTiming">
-                <xsd:attribute name="DeltaT" use="required" type="xsd:float">
+                <xsd:attribute name="DeltaT" use="optional" type="xsd:float">
                         <xsd:annotation>
                                 <xsd:documentation>
@@ -335 +335 @@
                         </xsd:annotation>
                 </xsd:attribute>
-                <xsd:attribute name="ExposureTime" use="required" type="xsd:float">
+                <xsd:attribute name="ExposureTime" use="optional" type="xsd:float">
                         <xsd:annotation>
                                 <xsd:documentation>
@@ -727 +727 @@
                 <xsd:complexType>
                         <xsd:sequence>
-                                <xsd:element ref="Microscope" minOccurs="1" maxOccurs="1"/>
+                                <xsd:element ref="Microscope" minOccurs="0" maxOccurs="1"/>
                                 <xsd:element ref="LightSource" minOccurs="0" maxOccurs="unbounded"/>
                                 <xsd:element ref="Detector" minOccurs="0" maxOccurs="unbounded"/>
@@ -845 +845 @@
                                                         <xsd:element ref="Correction" minOccurs="1" maxOccurs="1"/>
                                                         <xsd:element ref="Immersion" minOccurs="1" maxOccurs="1"/>
-                                                        <xsd:element ref="LensNA" minOccurs="1" maxOccurs="1"/>
-                                                        <xsd:element ref="NominalMagnification" minOccurs="1" maxOccurs="1"/>
-                                                        <xsd:element ref="CalibratedMagnification" minOccurs="1" maxOccurs="1"/>
-                                                        <xsd:element ref="WorkingDistance" minOccurs="1" maxOccurs="1"/>
+                                                        <xsd:element ref="LensNA" minOccurs="0" maxOccurs="1"/>
+                                                        <xsd:element ref="NominalMagnification" minOccurs="0" maxOccurs="1"/>
+                                                        <xsd:element ref="CalibratedMagnification" minOccurs="0" maxOccurs="1"/>
+                                                        <xsd:element ref="WorkingDistance" minOccurs="0" maxOccurs="1"/>
                                                 </xsd:sequence>
                                         </xsd:sequence>
@@ -886 +886 @@
                                 <xsd:extension base="FilterSpec">
                                 <xsd:sequence>
-                                        <xsd:element ref="TransmittanceRange" minOccurs="1" maxOccurs="1"/>
+                                        <xsd:element ref="TransmittanceRange" minOccurs="0" maxOccurs="1"/>
                                 </xsd:sequence>
                                         <xsd:attribute name="Type" use="optional">
@@ -1081 +1081 @@
         </xsd:element>
         <xsd:complexType name="ManufactSpec">
-                <xsd:attribute name="Manufacturer" use="required" type="xsd:string"/>
-                <xsd:attribute name="Model" use="required" type="xsd:string"/>
+                <xsd:attribute name="Manufacturer" use="optional" type="xsd:string"/>
+                <xsd:attribute name="Model" use="optional" type="xsd:string"/>
                 <xsd:attribute name="SerialNumber" use="optional" type="xsd:string"/>
         </xsd:complexType>
@@ -1113 +1113 @@
                         <xsd:sequence>
                                 <xsd:element ref="Description" minOccurs="0" maxOccurs="1"/>
-                                <xsd:element ref="ExperimenterRef" minOccurs="1" maxOccurs="1"/>
+                                <xsd:element ref="ExperimenterRef" minOccurs="0" maxOccurs="1"/>
                                 <xsd:element ref="GroupRef" minOccurs="0" maxOccurs="1"/>
                         </xsd:sequence>
-                        <xsd:attribute name="Name" use="required" type="xsd:string"/>
+                        <xsd:attribute name="Name" use="optional" type="xsd:string"/>
                         <xsd:attribute name="ID" use="required" type="ProjectID"/>
                 </xsd:complexType>
@@ -1761 +1761 @@
                                 <xsd:element ref="CA:CustomAttributes" minOccurs="0" maxOccurs="1"/>
                         </xsd:sequence>
-                        <xsd:attribute name="Name" use="required" type="xsd:string"/>
+                        <xsd:attribute name="Name" use="optional" type="xsd:string"/>
                         <xsd:attribute name="ID" use="required" type="DatasetID"/>
                         <xsd:attribute name="Locked" default="false" use="optional" type="xsd:boolean"/>