Changeset 68 for Xml/Release

Timestamp:

07/18/07 16:13:34 (17 months ago)

Author:

andrew

Message:

Final changes to the SPW to remove ExternalDBRef
Adding the final version of the XSD to the web site

Location:

Xml/Release

Files:

• SPW.xsd (modified) (6 diffs)
• ome.xsd (modified) (1 diff)

Xml/Release/SPW.xsd

@@ -34 +34 @@
     </xsd:annotation>
 
-    <xsd:simpleType name="ExternDBref">
-        <xsd:annotation>
-            <xsd:documentation>
-                                A type based on string used to store a reference to an object in an external database. 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
- 
     <xsd:element name="Plate">
         <xsd:annotation>
@@ -78 +69 @@
                     </xsd:annotation>
                         </xsd:attribute>
-            <xsd:attribute name="ExternRef" type="ExternDBref">
-                <xsd:annotation>
-                    <xsd:documentation>
-                                The EternRef attribute may contain a reference to an external database.
-                                                This is called ExternalIdentifier in the EA Diagrams
+            <xsd:attribute name="ExternalIdentifier" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The ExternalIdentifier attribute may contain a reference to an external database.
                     </xsd:documentation>
                 </xsd:annotation>       
@@ -181 +171 @@
             <xsd:attribute name="ID" use="required" type="ScreenID"/>
             <xsd:attribute name="Name" use="required" type="xsd:string"/>
-            <xsd:attribute name="ProtocolIdentifier" type="ExternDBref">
+            <xsd:attribute name="ProtocolIdentifier" type="xsd:string">
                                 <xsd:annotation>
                                     <xsd:documentation>
@@ -317 +307 @@
                 <xsd:annotation>
                     <xsd:documentation>
-                                                A pointer to an externally defined identifier for this plate.
+                        The ExternalIdentifier attribute may contain a reference to an external database.
                     </xsd:documentation>
                 </xsd:annotation>           
@@ -365 +355 @@
                 </xsd:annotation>     
             </xsd:attribute>
-            <xsd:attribute name="PosX" type="xsd:integer">
+            <xsd:attribute name="PosX" type="xsd:float">
                 <xsd:annotation>
                     <xsd:documentation>
@@ -372 +362 @@
                 </xsd:annotation>
             </xsd:attribute>
-            <xsd:attribute name="PosY" type="xsd:integer">
+            <xsd:attribute name="PosY" type="xsd:float">
                 <xsd:annotation>
                     <xsd:documentation>

Xml/Release/ome.xsd

@@ -962 +962 @@
                         <xsd:documentation>
                                 Just some free-form text to describe Images, Screens and Projects.
-                                The content model is ANY, which means that en entire XML sub-document can be placed here.
+                                The content model is ANY, which means that an entire XML sub-document can be placed here.
                         </xsd:documentation>
                 </xsd:annotation>