CDPP / AMDA_Kernel

Commit d17bbdea1abe7fabdcc6f0fc02dcbbc9821bb64f

Authored by Benjamin Renard
1 parent c2fa3b5d
Exists in master and in 98 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SolarOrbiter, SpeasyGet, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Update XSD files : All info elements are optionals + elements can appear in any order

Showing 3 changed files with 29 additions and 28 deletions   Show diff stats
Inline Side-by-side
config/xsd/info/instrumentInfo.xsd
  Diff comments   View file @d17bbde
... ... @@ -3,15 +3,15 @@
3 3 <xs:element name="instrument" type="InstrumentType"></xs:element>
4 4  
5 5 <xs:complexType name="InstrumentType">
6   - <xs:sequence>
7   - <xs:element name="name" type="xs:string"></xs:element>
8   - <xs:element name="description" type="xs:string"></xs:element>
9   - <xs:element name="url" type="xs:string"></xs:element>
10   - <xs:element name="measurement_type" type="xs:string"></xs:element>
11   - <xs:element name="pi" type="xs:string"></xs:element>
12   - <xs:element name="instrument_type" type="xs:string"></xs:element>
13   - <xs:element name="mission_id" type="xs:string"></xs:element>
14   - </xs:sequence>
  6 + <xs:all>
  7 + <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  8 + <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  9 + <xs:element name="url" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  10 + <xs:element name="measurement_type" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  11 + <xs:element name="pi" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  12 + <xs:element name="instrument_type" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  13 + <xs:element name="mission_id" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  14 + </xs:all>
15 15 <xs:attribute name="id" type="xs:ID" use="required" />
16 16 </xs:complexType>
17   -</xs:schema>
18 17 \ No newline at end of file
  18 +</xs:schema>
... ...
config/xsd/info/missionInfo.xsd
  Diff comments   View file @d17bbde
... ... @@ -3,11 +3,11 @@
3 3 <xs:element name="mission" type="MissionType"></xs:element>
4 4  
5 5 <xs:complexType name="MissionType">
6   - <xs:sequence>
7   - <xs:element name="name" type="xs:string"></xs:element>
8   - <xs:element name="description" type="xs:string"></xs:element>
9   - <xs:element name="url" type="xs:string"></xs:element>
10   - </xs:sequence>
  6 + <xs:all>
  7 + <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  8 + <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  9 + <xs:element name="url" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  10 + </xs:all>
11 11 <xs:attribute name="id" type="xs:ID" use="required" />
12 12 </xs:complexType>
13   -</xs:schema>
14 13 \ No newline at end of file
  14 +</xs:schema>
... ...
config/xsd/info/paramInfo.xsd
  Diff comments   View file @d17bbde
... ... @@ -66,14 +66,14 @@
66 66 </xs:attributeGroup>
67 67  
68 68 <xs:complexType name="paramInfoType">
69   - <xs:sequence>
70   - <xs:element name="name" type="xs:string"></xs:element>
71   - <xs:element name="short_name" type="xs:string"></xs:element>
72   - <xs:element name="components" type="xs:string"></xs:element>
73   - <xs:element name="units" type="xs:string"></xs:element>
74   - <xs:element name="coordinates_system" type="xs:string"></xs:element>
75   - <xs:element name="tensor_order" type="xs:string"></xs:element>
76   - <xs:element name="si_conversion" type="xs:string"></xs:element>
  69 + <xs:all>
  70 + <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  71 + <xs:element name="short_name" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  72 + <xs:element name="components" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  73 + <xs:element name="units" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  74 + <xs:element name="coordinates_system" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  75 + <xs:element name="tensor_order" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  76 + <xs:element name="si_conversion" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
77 77 <xs:element name="table" minOccurs="0" maxOccurs="1">
78 78 <xs:complexType>
79 79 <xs:sequence>
... ... @@ -82,8 +82,8 @@
82 82 </xs:sequence>
83 83 </xs:complexType>
84 84 </xs:element>
85   - <xs:element name="fill_value" type="xs:string"></xs:element>
86   - <xs:element name="ucd" type="xs:string"></xs:element>
  85 + <xs:element name="fill_value" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  86 + <xs:element name="ucd" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
87 87 <xs:element name="status_def" minOccurs="0" maxOccurs="1">
88 88 <xs:complexType>
89 89 <xs:sequence>
... ... @@ -96,7 +96,8 @@
96 96 </xs:sequence>
97 97 </xs:complexType>
98 98 </xs:element>
99   - <xs:element name="dataset_id" type="xs:string"></xs:element>
100   - </xs:sequence>
  99 + <xs:element name="dataset_id" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  100 + <xs:element name="instrument_id" type="xs:string" minOccurs="0" maxOccurs="1"></xs:element>
  101 + </xs:all>
101 102 </xs:complexType>
102 103 </xs:schema>
... ...