Skip to content

Commit 11b8b57

Browse files
SaintierFrDennis Labordus
authored and
Dennis Labordus
committed
142 compas core update xsd file (#143)
* Issue #142: Update SCL_CoMPAS.xsd file and its consequencies (tSclFileType type in scl-extensions.xjb file) Signed-off-by: SAINTIER FRANCOIS <[email protected]> * Issue #142: Second update of SCL_CoMPAS.xsd file Signed-off-by: SAINTIER FRANCOIS <[email protected]> * Issue #142: Third update of SCL_CoMPAS.xsd file (correction of the mistakes in sclName and SclFileType). Revert the modification done in scl-extensions.xjb Signed-off-by: SAINTIER FRANCOIS <[email protected]> Signed-off-by: Dennis Labordus <[email protected]>
1 parent 516fa39 commit 11b8b57

File tree

1 file changed

+34
-17
lines changed

1 file changed

+34
-17
lines changed

scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<xs:documentation xml:lang="en">
1414
Version 1.0 Release 2021/06/16
1515
Version 1.1 Release 2022/01/21
16+
Version 1.2 Release 2022/06/08
1617
</xs:documentation>
1718
</xs:annotation>
1819

@@ -150,12 +151,24 @@ SPDX-License-Identifier: Apache-2.0
150151
</xs:documentation>
151152
</xs:annotation>
152153
<xs:restriction base="xs:string">
153-
<xs:enumeration value="BAY_EXTERNAL"/>
154154
<xs:enumeration value="BAY_INTERNAL"/>
155-
<xs:enumeration value="BAY_INTERNAL_EXTERNAL"/>
155+
<xs:enumeration value="BAY_EXTERNAL"/>
156+
</xs:restriction>
157+
</xs:simpleType>
158+
159+
<xs:simpleType name="tCompasTopoNodeDirection">
160+
<xs:annotation>
161+
<xs:documentation xml:lang="en">
162+
Define if a Node Direction is Up or Down
163+
</xs:documentation>
164+
</xs:annotation>
165+
<xs:restriction base="xs:string">
166+
<xs:enumeration value="Up"/>
167+
<xs:enumeration value="Down"/>
156168
</xs:restriction>
157169
</xs:simpleType>
158170

171+
159172
<xs:complexType name="tCompasFlow">
160173
<xs:annotation>
161174
<xs:documentation xml:lang="en">
@@ -182,23 +195,14 @@ SPDX-License-Identifier: Apache-2.0
182195
The BayCodif is specific to each user to identify the bay kind.
183196
</xs:documentation>
184197
</xs:annotation>
185-
<xs:attribute name="BayCodif" type="xs:string" use="optional"/>
186198
<xs:attribute name="UUID" type="xs:string" use="optional"/>
199+
<xs:attribute name="Indice" type="xs:string" use="optional"/>
187200
<xs:attribute name="Version" type="xs:string" use="optional"/>
188201
<xs:attribute name="MainLabel" type="xs:string" use="optional"/>
189202
<xs:attribute name="SecondLabel" type="xs:string" use="optional"/>
190-
<xs:attribute name="NumBay" type="xs:string" use="optional"/>
191-
<xs:attribute name="ZoneNumber" type="xs:string" use="optional"/>
192-
</xs:complexType>
193-
194-
<xs:complexType name="tCompasConnectivityNode">
195-
<xs:annotation>
196-
<xs:documentation xml:lang="en">
197-
Define the specific busbarsection or zone of the connectivity node
198-
</xs:documentation>
199-
</xs:annotation>
200-
<xs:attribute name="UUID" type="xs:string" use="optional"/>
201-
<xs:attribute name="ZoneNumber" type="xs:string" use="optional"/>
203+
<xs:attribute name="BayCodif" type="xs:string" use="optional"/>
204+
<xs:attribute name="NumBay" type="xs:integer" use="optional"/>
205+
<xs:attribute name="BayCount" type="xs:integer" use="optional"/>
202206
</xs:complexType>
203207

204208
<xs:complexType name="tCompasICDHeader" mixed="true">
@@ -263,14 +267,27 @@ SPDX-License-Identifier: Apache-2.0
263267
<xs:attribute name="CriteriaAssociationID" type="xs:string" use="optional"/>
264268
</xs:complexType>
265269

270+
<xs:complexType name="tCompasTopo">
271+
<xs:annotation>
272+
<xs:documentation xml:lang="en">
273+
Describe the connectivity node and layout order for a given Bay;can be multiple instanciated in case of bay which is connected to multiple nodes
274+
</xs:documentation>
275+
</xs:annotation>
276+
<xs:attribute name="Node" type="xs:string" use="required"/>
277+
<xs:attribute name="NodeOrder" type="xs:integer" use="required"/>
278+
<xs:attribute name="Direction" type="tCompasTopoNodeDirection" use="required"/>
279+
</xs:complexType>
280+
281+
266282
<xs:element name="SclName" type="tCompasSclName"/>
267283
<xs:element name="SclFileType" type="tCompasSclFileType"/>
268284
<xs:element name="Flow" type="tCompasFlow"/>
269-
<xs:element name="ConnectivityNode" type="tCompasConnectivityNode"/>
270285
<xs:element name="Bay" type="tCompasBay"/>
271286
<xs:element name="LDevice" type="tCompasLDevice"/>
272287
<xs:element name="Criteria" type="tCompasCriteria"/>
273288
<xs:element name="ICDHeader" type="tCompasICDHeader"/>
274289
<xs:element name="SystemVersion" type="tCompasSystemVersion"/>
275290
<xs:element name="Function" type="tCompasFunction"/>
276-
</xs:schema>
291+
<xs:element name="Topo" type="tCompasTopo"/>
292+
293+
</xs:schema>

0 commit comments

Comments
 (0)