• Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Change
  • Next Change →

Changeset 195 for Xml/Working/CA.xsd

Show
Ignore:
Timestamp:
09/10/08 12:03:10 (4 months ago)
Author:
andrew
Message:

Version presented in meeting 10th Sept 2008

Files:
1 modified

  • Xml/Working/CA.xsd (modified) (2 diffs)

Legend:

Unmodified
Added
Removed
  • Xml/Working/CA.xsd

    r152 r195  
    2323         elementFormDefault = "qualified"> 
    2424        <xsd:import namespace = "http://www.openmicroscopy.org/Schemas/OME/2008-02" schemaLocation = "http://www.openmicroscopy.org/Schemas/OME/2008-02/ome.xsd"/> 
    25         <xsd:element name = "OME"> 
     25        <xsd:element name = "OME"> <!-- top level definition --> 
    2626                <xsd:complexType> 
    2727                        <xsd:sequence> 
    28                                 <xsd:element ref = "Project"/> 
    29                                 <xsd:element ref = "Dataset"/> 
    30                                 <xsd:element ref = "Image"/> 
    31                                 <xsd:element ref = "CustomAttributes"/> 
     28                                <xsd:element ref = "Project" minOccurs="1" maxOccurs="1"/> 
     29                                <xsd:element ref = "Dataset" minOccurs="1" maxOccurs="1"/> 
     30                                <xsd:element ref = "Image" minOccurs="1" maxOccurs="1"/> 
     31                                <xsd:element ref = "CustomAttributes" minOccurs="1" maxOccurs="1"/> 
    3232                        </xsd:sequence> 
    3333                </xsd:complexType> 
    3434        </xsd:element> 
    35         <xsd:element name = "Dataset"> 
     35        <xsd:element name = "Dataset">  <!-- top level definition --> 
    3636                <xsd:complexType> 
    3737                        <xsd:sequence> 
    3838                                <xsd:element ref = "ProjectRef" minOccurs = "0" maxOccurs = "unbounded"/> 
    39                                 <xsd:element ref = "CustomAttributes" minOccurs = "0"/> 
     39                                <xsd:element ref = "CustomAttributes" minOccurs = "0" maxOccurs="1"/> 
    4040                        </xsd:sequence> 
    4141                        <xsd:attribute name = "ID" use = "required" type = "OME:DatasetID"/> 
    42                         <xsd:attribute name = "Name" type = "xsd:string"/> 
    43                         <xsd:attribute name = "Description" type = "xsd:string"/> 
    44                         <xsd:attribute name = "Locked" type = "xsd:boolean"/> 
    45                         <xsd:attribute name = "Experimenter" type = "OME:ExperimenterID"/> 
    46                         <xsd:attribute name = "Group" type = "OME:GroupID"/> 
     42                        <xsd:attribute name = "Name" use="optional" type = "xsd:string"/> 
     43                        <xsd:attribute name = "Description" use="optional" type = "xsd:string"/> 
     44                        <xsd:attribute name = "Locked" use="optional" type = "xsd:boolean"/> 
     45                        <xsd:attribute name = "Experimenter" use="optional" type = "OME:ExperimenterID"/> 
     46                        <xsd:attribute name = "Group" use="optional" type = "OME:GroupID"/> 
    4747                </xsd:complexType> 
    4848        </xsd:element> 
    49         <xsd:element name = "Image"> 
     49        <xsd:element name = "Image"> <!-- top level definition --> 
    5050                <xsd:complexType> 
    5151                        <xsd:sequence> 
    5252                                <xsd:element ref = "DatasetRef" minOccurs = "0" maxOccurs = "unbounded"/> 
    5353                                <xsd:element ref = "Region" minOccurs = "0" maxOccurs = "unbounded"/> 
    54                                 <xsd:element ref = "CustomAttributes" minOccurs = "0"/> 
     54                                <xsd:element ref = "CustomAttributes" minOccurs = "0" maxOccurs="1"/> 
    5555                        </xsd:sequence> 
    5656                        <xsd:attribute name = "ID" use = "required" type = "OME:ImageID"/> 
    57                         <xsd:attribute name = "Name" type = "xsd:string"/> 
    58                         <xsd:attribute name = "CreationDate" type = "xsd:dateTime"/> 
    59                         <xsd:attribute name = "Description" type = "xsd:string"/> 
    60                         <xsd:attribute name = "Experimenter" type = "OME:ExperimenterID"/> 
    61                         <xsd:attribute name = "Group" type = "OME:GroupID"/> 
    62                         <xsd:attribute name = "DefaultPixels" type = "OME:PixelsID"/> 
     57                        <xsd:attribute name = "Name" use="optional" type = "xsd:string"/> 
     58                        <xsd:attribute name = "CreationDate" use="optional" type = "xsd:dateTime"/> 
     59                        <xsd:attribute name = "Description" use="optional" type = "xsd:string"/> 
     60                        <xsd:attribute name = "Experimenter" use="optional" type = "OME:ExperimenterID"/> 
     61                        <xsd:attribute name = "Group" use="optional" type = "OME:GroupID"/> 
     62                        <xsd:attribute name = "DefaultPixels" use="optional" type = "OME:PixelsID"/> 
    6363                </xsd:complexType> 
    6464        </xsd:element> 
    65         <xsd:element name = "Region"> 
     65        <xsd:element name = "Region"> <!-- top level definition --> 
    6666                <xsd:complexType> 
    6767                        <xsd:sequence> 
    6868                                <xsd:element ref = "Region" minOccurs = "0" maxOccurs = "unbounded"/> 
    69                                 <xsd:element ref = "CustomAttributes" minOccurs = "0"/> 
     69                                <xsd:element ref = "CustomAttributes" minOccurs = "0" maxOccurs="1"/> 
    7070                        </xsd:sequence> 
    7171                        <xsd:attribute name = "ID" use = "required" type = "OME:RegionID"/> 
    72                         <xsd:attribute name = "Name" type = "xsd:string"/> 
    73                         <xsd:attribute name = "Tag" type = "xsd:string"/> 
     72                        <xsd:attribute name = "Name" use="optional" type = "xsd:string"/> 
     73                        <xsd:attribute name = "Tag" use="optional" type = "xsd:string"/> 
    7474                </xsd:complexType> 
    7575        </xsd:element> 
    76         <xsd:element name = "CustomAttributes"> 
     76        <xsd:element name = "CustomAttributes"> <!-- top level definition --> 
    7777                <xsd:complexType> 
    7878                        <xsd:sequence> 
    … …  
    8181                </xsd:complexType> 
    8282        </xsd:element> 
    83         <xsd:element name = "Project"> 
     83        <xsd:element name = "Project"> <!-- top level definition --> 
    8484                <xsd:complexType> 
    8585                        <xsd:attribute name = "ID" use = "required" type = "OME:ProjectID"/> 
    86                         <xsd:attribute name = "Name" type = "xsd:string"/> 
    87                         <xsd:attribute name = "Description" type = "xsd:string"/> 
    88                         <xsd:attribute name = "Experimenter" type = "OME:ExperimenterID"/> 
    89                         <xsd:attribute name = "Group" type = "OME:GroupID"/> 
     86                        <xsd:attribute name = "Name" use="optional" type = "xsd:string"/> 
     87                        <xsd:attribute name = "Description" use="optional" type = "xsd:string"/> 
     88                        <xsd:attribute name = "Experimenter" use="optional" type = "OME:ExperimenterID"/> 
     89                        <xsd:attribute name = "Group" use="optional" type = "OME:GroupID"/> 
    9090                </xsd:complexType> 
    9191        </xsd:element> 
    92         <xsd:element name = "DatasetRef"> 
     92        <xsd:element name = "DatasetRef"> <!-- top level definition --> 
    9393                <xsd:complexType> 
    9494                        <xsd:attribute name = "ID" use = "required" type = "OME:DatasetID"/> 
    9595                </xsd:complexType> 
    9696        </xsd:element> 
    97         <xsd:element name = "ProjectRef"> 
     97        <xsd:element name = "ProjectRef"> <!-- top level definition --> 
    9898                <xsd:complexType> 
    9999                        <xsd:attribute name = "ID" use = "required" type = "OME:ProjectID"/> 

Download in other formats:

  • Unified Diff
  • Zip Archive

Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/