Changeset 93 for Xml/Working
- Timestamp:
- 09/19/07 13:52:48 (14 months ago)
- Location:
- Xml/Working
- Files:
-
- 1 added
- 4 modified
-
. (modified) (1 prop)
-
AnalysisModule.xsd (modified) (1 diff)
-
SPW.xsd (modified) (6 diffs)
-
completesample-local.xml (added)
-
ome.xsd (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Xml/Working
- Property svn:ignore
-
old new 1 1 .DS_Store 2 2 Working Project.tmproj 3 ClareQuestions.xml
-
- Property svn:ignore
-
Xml/Working/AnalysisModule.xsd
r71 r93 415 415 <simpleType name = "ModuleID"> 416 416 <restriction base = "OME:LSID"> 417 <pattern value = "(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Module:\S+)|(Module:\S+)"/>417 <pattern value = "(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Module:\S+)|(Module:\S+)"/> 418 418 </restriction> 419 419 </simpleType> -
Xml/Working/SPW.xsd
r68 r93 98 98 <xsd:simpleType name="PlateID"> 99 99 <xsd:restriction base="OME:LSID"> 100 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Plate:\S+)|(Plate:\S+)"/>100 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Plate:\S+)|(Plate:\S+)"/> 101 101 </xsd:restriction> 102 102 </xsd:simpleType> … … 147 147 <xsd:simpleType name="ReagentID"> 148 148 <xsd:restriction base="OME:LSID"> 149 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Reagent:\S+)|(Reagent:\S+)"/>149 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Reagent:\S+)|(Reagent:\S+)"/> 150 150 </xsd:restriction> 151 151 </xsd:simpleType> … … 215 215 <xsd:simpleType name="ScreenID"> 216 216 <xsd:restriction base="OME:LSID"> 217 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Screen:\S+)|(Screen:\S+)"/>217 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Screen:\S+)|(Screen:\S+)"/> 218 218 </xsd:restriction> 219 219 </xsd:simpleType> … … 269 269 <xsd:simpleType name="ScreenAcquisitionID"> 270 270 <xsd:restriction base="OME:LSID"> 271 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:ScreenAcquisition:\S+)|(ScreenAcquisition:\S+)"/>271 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:ScreenAcquisition:\S+)|(ScreenAcquisition:\S+)"/> 272 272 </xsd:restriction> 273 273 </xsd:simpleType> … … 333 333 <xsd:simpleType name="WellID"> 334 334 <xsd:restriction base="OME:LSID"> 335 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Well:\S+)|(Well:\S+)"/>335 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Well:\S+)|(Well:\S+)"/> 336 336 </xsd:restriction> 337 337 </xsd:simpleType> … … 381 381 <xsd:simpleType name="WellSampleID"> 382 382 <xsd:restriction base="OME:LSID"> 383 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:WellSample:\S+)|(WellSample:\S+)"/>383 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:WellSample:\S+)|(WellSample:\S+)"/> 384 384 </xsd:restriction> 385 385 </xsd:simpleType> -
Xml/Working/ome.xsd
r73 r93 24 24 xmlns:CA="http://www.openmicroscopy.org/Schemas/CA/2007-06" 25 25 xmlns:SPW="http://www.openmicroscopy.org/Schemas/SPW/2007-06" 26 version=" 1"26 version="2" 27 27 elementFormDefault="qualified"> 28 28 <xsd:import namespace="http://www.openmicroscopy.org/Schemas/AnalysisModule/2007-06" schemaLocation="http://www.openmicroscopy.org/Schemas/AnalysisModule/2007-06/AnalysisModule.xsd"/> … … 34 34 <xsd:documentation> 35 35 Open Microscopy Environment 36 OME XML Schema 2.0-RC136 OME XML Schema June 2007 - Update Version 2 September 2007 37 37 Author: Ilya G. Goldberg, Andrew J Patterson 38 38 Copyright 2002 - 2007 OME. All rights reserved. … … 685 685 <xsd:sequence> 686 686 <xsd:element ref="Microscope"/> 687 <xsd:element ref="LightSource" m axOccurs="unbounded"/>688 <xsd:element ref="Detector" m axOccurs="unbounded"/>689 <xsd:element ref="Objective" m axOccurs="unbounded"/>687 <xsd:element ref="LightSource" minOccurs="0" maxOccurs="unbounded"/> 688 <xsd:element ref="Detector" minOccurs="0" maxOccurs="unbounded"/> 689 <xsd:element ref="Objective" minOccurs="0" maxOccurs="unbounded"/> 690 690 <xsd:element ref="FilterSet" minOccurs="0" maxOccurs="unbounded"/> 691 691 <xsd:element ref="Filter" minOccurs="0" maxOccurs="unbounded"/> 692 692 <xsd:element ref="Dichroic" minOccurs="0" maxOccurs="unbounded"/> 693 <xsd:element ref="OTF" m axOccurs="unbounded"/>693 <xsd:element ref="OTF" minOccurs="0" maxOccurs="unbounded"/> 694 694 </xsd:sequence> 695 695 <xsd:attribute name="ID" use="required" type="InstrumentID"/> … … 709 709 </xsd:complexType> 710 710 </xsd:element> 711 <xsd:element name="Experimenter" type="ExperimenterType">711 <xsd:element name="Experimenter"> 712 712 <xsd:annotation> 713 713 <xsd:documentation> … … 715 715 This person may also be a user of the OME system, in which case the OMEName element contains their login name. 716 716 Experimenters may belong to one or more groups which are specified using one or more GroupRef elements. 717 </xsd:documentation> 718 </xsd:annotation> 717 Note while FirstName, LastName, Email and OMEName are all optional to be valid an Experimenter must have AT LEAST ONE present 718 </xsd:documentation> 719 </xsd:annotation> 720 <xsd:complexType> 721 <xsd:sequence> 722 <xsd:choice> 723 <xsd:annotation> 724 <xsd:documentation> 725 At lease one of (FirstName, LastName, Email, OMEName) 726 </xsd:documentation> 727 </xsd:annotation> 728 <xsd:sequence> 729 <xsd:element ref="FirstName"/> 730 <xsd:element ref="LastName" minOccurs="0"/> 731 <xsd:element ref="Email" minOccurs="0"/> 732 <xsd:element ref="Institution" minOccurs="0"/> 733 <xsd:element ref="OMEName" minOccurs="0"/> 734 </xsd:sequence> 735 <xsd:sequence> 736 <xsd:element ref="LastName"/> 737 <xsd:element ref="Email" minOccurs="0"/> 738 <xsd:element ref="Institution" minOccurs="0"/> 739 <xsd:element ref="OMEName" minOccurs="0"/> 740 </xsd:sequence> 741 <xsd:sequence> 742 <xsd:element ref="Email"/> 743 <xsd:element ref="Institution" minOccurs="0"/> 744 <xsd:element ref="OMEName" minOccurs="0"/> 745 </xsd:sequence> 746 <xsd:sequence> 747 <xsd:element ref="Institution" minOccurs="0"/> 748 <xsd:element ref="OMEName"/> 749 </xsd:sequence> 750 </xsd:choice> 751 <xsd:element ref="GroupRef" minOccurs="0" maxOccurs="unbounded"/> 752 </xsd:sequence> 753 <xsd:attribute name="ID" use="required" type="ExperimenterID"/> 754 </xsd:complexType> 719 755 </xsd:element> 720 756 <xsd:element name="OMEName" type="xsd:string"> … … 1112 1148 </xsd:annotation> 1113 1149 <xsd:restriction base="xsd:string"> 1114 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:\S+:\S+)|(\S+:\S+)"/>1150 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:\S+:\S+)|(\S+:\S+)"/> 1115 1151 </xsd:restriction> 1116 1152 </xsd:simpleType> 1117 1153 <xsd:simpleType name="ProjectID"> 1118 1154 <xsd:restriction base="LSID"> 1119 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Project:\S+)|(Project:\S+)"/>1155 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Project:\S+)|(Project:\S+)"/> 1120 1156 </xsd:restriction> 1121 1157 </xsd:simpleType> 1122 1158 <xsd:simpleType name="DatasetID"> 1123 1159 <xsd:restriction base="LSID"> 1124 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Dataset:\S+)|(Dataset:\S+)"/>1160 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Dataset:\S+)|(Dataset:\S+)"/> 1125 1161 </xsd:restriction> 1126 1162 </xsd:simpleType> 1127 1163 <xsd:simpleType name="ImageID"> 1128 1164 <xsd:restriction base="LSID"> 1129 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Image:\S+)|(Image:\S+)"/>1165 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Image:\S+)|(Image:\S+)"/> 1130 1166 </xsd:restriction> 1131 1167 </xsd:simpleType> 1132 1168 <xsd:simpleType name="RegionID"> 1133 1169 <xsd:restriction base="LSID"> 1134 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Region:\S+)|(Region:\S+)"/>1170 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Region:\S+)|(Region:\S+)"/> 1135 1171 </xsd:restriction> 1136 1172 </xsd:simpleType> 1137 1173 <xsd:simpleType name="ExperimenterID"> 1138 1174 <xsd:restriction base="LSID"> 1139 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Experimenter:\S+)|(Experimenter:\S+)"/>1175 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Experimenter:\S+)|(Experimenter:\S+)"/> 1140 1176 </xsd:restriction> 1141 1177 </xsd:simpleType> 1142 1178 <xsd:simpleType name="GroupID"> 1143 1179 <xsd:restriction base="LSID"> 1144 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Group:\S+)|(Group:\S+)"/>1180 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Group:\S+)|(Group:\S+)"/> 1145 1181 </xsd:restriction> 1146 1182 </xsd:simpleType> 1147 1183 <xsd:simpleType name="ExperimentID"> 1148 1184 <xsd:restriction base="LSID"> 1149 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Experiment:\S+)|(Experiment:\S+)"/>1185 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Experiment:\S+)|(Experiment:\S+)"/> 1150 1186 </xsd:restriction> 1151 1187 </xsd:simpleType> 1152 1188 <xsd:simpleType name="MicrobeamManipulationID"> 1153 1189 <xsd:restriction base="LSID"> 1154 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:MicrobeamManipulation:\S+)|(MicrobeamManipulation:\S+)"/>1190 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:MicrobeamManipulation:\S+)|(MicrobeamManipulation:\S+)"/> 1155 1191 </xsd:restriction> 1156 1192 </xsd:simpleType> 1157 1193 <xsd:simpleType name="ROIID"> 1158 1194 <xsd:restriction base="LSID"> 1159 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:ROI:\S+)|(ROI:\S+)"/>1195 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:ROI:\S+)|(ROI:\S+)"/> 1160 1196 </xsd:restriction> 1161 1197 </xsd:simpleType> 1162 1198 <xsd:simpleType name="InstrumentID"> 1163 1199 <xsd:restriction base="LSID"> 1164 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Instrument:\S+)|(Instrument:\S+)"/>1200 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Instrument:\S+)|(Instrument:\S+)"/> 1165 1201 </xsd:restriction> 1166 1202 </xsd:simpleType> 1167 1203 <xsd:simpleType name="ObjectiveID"> 1168 1204 <xsd:restriction base="LSID"> 1169 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Objective:\S+)|(Objective:\S+)"/>1205 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Objective:\S+)|(Objective:\S+)"/> 1170 1206 </xsd:restriction> 1171 1207 </xsd:simpleType> 1172 1208 <xsd:simpleType name="ObjectiveSettingsID"> 1173 1209 <xsd:restriction base="LSID"> 1174 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:ObjectiveSettings:\S+)|(ObjectiveSettings:\S+)"/>1210 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:ObjectiveSettings:\S+)|(ObjectiveSettings:\S+)"/> 1175 1211 </xsd:restriction> 1176 1212 </xsd:simpleType> 1177 1213 <xsd:simpleType name="LightSourceID"> 1178 1214 <xsd:restriction base="LSID"> 1179 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:LightSource:\S+)|(LightSource:\S+)"/>1215 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:LightSource:\S+)|(LightSource:\S+)"/> 1180 1216 </xsd:restriction> 1181 1217 </xsd:simpleType> 1182 1218 <xsd:simpleType name="DichroicID"> 1183 1219 <xsd:restriction base="LSID"> 1184 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Dichroic:\S+)|(Dichroic:\S+)"/>1220 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Dichroic:\S+)|(Dichroic:\S+)"/> 1185 1221 </xsd:restriction> 1186 1222 </xsd:simpleType> 1187 1223 <xsd:simpleType name="FilterID"> 1188 1224 <xsd:restriction base="LSID"> 1189 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Filter:\S+)|(Filter:\S+)"/>1225 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Filter:\S+)|(Filter:\S+)"/> 1190 1226 </xsd:restriction> 1191 1227 </xsd:simpleType> 1192 1228 <xsd:simpleType name="FilterSetID"> 1193 1229 <xsd:restriction base="LSID"> 1194 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:FilterSet:\S+)|(FilterSet:\S+)"/>1230 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:FilterSet:\S+)|(FilterSet:\S+)"/> 1195 1231 </xsd:restriction> 1196 1232 </xsd:simpleType> 1197 1233 <xsd:simpleType name="OTFID"> 1198 1234 <xsd:restriction base="LSID"> 1199 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:OTF:\S+)|(OTF:\S+)"/>1235 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:OTF:\S+)|(OTF:\S+)"/> 1200 1236 </xsd:restriction> 1201 1237 </xsd:simpleType> 1202 1238 <xsd:simpleType name="DetectorID"> 1203 1239 <xsd:restriction base="LSID"> 1204 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Detector:\S+)|(Detector:\S+)"/>1240 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Detector:\S+)|(Detector:\S+)"/> 1205 1241 </xsd:restriction> 1206 1242 </xsd:simpleType> 1207 1243 <xsd:simpleType name="PixelsID"> 1208 1244 <xsd:restriction base="LSID"> 1209 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Pixels:\S+)|(Pixels:\S+)"/>1245 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Pixels:\S+)|(Pixels:\S+)"/> 1210 1246 </xsd:restriction> 1211 1247 </xsd:simpleType> 1212 1248 <xsd:simpleType name="DisplayOptionsID"> 1213 1249 <xsd:restriction base="LSID"> 1214 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:DisplayOptions:\S+)|(DisplayOptions:\S+)"/>1250 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:DisplayOptions:\S+)|(DisplayOptions:\S+)"/> 1215 1251 </xsd:restriction> 1216 1252 </xsd:simpleType> 1217 1253 <xsd:simpleType name="LogicalChannelID"> 1218 1254 <xsd:restriction base="LSID"> 1219 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:LogicalChannel:\S+)|(LogicalChannel:\S+)"/>1255 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:LogicalChannel:\S+)|(LogicalChannel:\S+)"/> 1220 1256 </xsd:restriction> 1221 1257 </xsd:simpleType> … … 1237 1273 <xsd:simpleType name="ModuleID"> 1238 1274 <xsd:restriction base="LSID"> 1239 <xsd:pattern value="(urn:lsid:([\w -\.]+\.[\w-\.]+)+:Module:\S+)|(Module:\S+)"/>1275 <xsd:pattern value="(urn:lsid:([\w\-\.]+\.[\w\-\.]+)+:Module:\S+)|(Module:\S+)"/> 1240 1276 </xsd:restriction> 1241 1277 </xsd:simpleType> … … 1300 1336 </xsd:complexType> 1301 1337 </xsd:element> 1302 <xsd:complexType name="ExperimenterType">1303 <xsd:annotation>1304 <xsd:documentation>1305 An element type to specify an Experimenter under OME.1306 It consists of a Person element group and a login name specified under OMEName.1307 </xsd:documentation>1308 </xsd:annotation>1309 <xsd:sequence>1310 <xsd:element ref="FirstName"/>1311 <xsd:element ref="LastName"/>1312 <xsd:element ref="Email"/>1313 <xsd:element ref="Institution"/>1314 <xsd:element ref="OMEName" minOccurs="0"/>1315 <xsd:element ref="GroupRef" maxOccurs="unbounded"/>1316 </xsd:sequence>1317 <xsd:attribute name="ID" use="required" type="ExperimenterID"/>1318 </xsd:complexType>1319 1338 <xsd:element name="Contact"> 1320 1339 <xsd:annotation>
