r00t2/xml
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

minor tweaks here

Browse Source
This commit is contained in:
brent s. 2019-12-10 11:07:55 -05:00
parent 2295c0a078
commit e08444fae7
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
schema/lib/types/std.xsd
View File

@ -62,9 +62,10 @@
</xs:simpleType> </xs:simpleType>


<xs:complexType name="t_std_gpg_keys"> <xs:complexType name="t_std_gpg_keys">
<xs:sequence minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="keyID" minOccurs="1" maxOccurs="unbounded" type="t_std_gpg_key_id"/> <xs:element name="keyID" minOccurs="0" maxOccurs="unbounded" type="t_std_gpg_key_id"/>
</xs:sequence> <xs:element name="keyFile" minOccurs="0" maxOccurs="unbounded" type="t_std_uri"/>
</xs:choice>
</xs:complexType> </xs:complexType>
<xs:simpleType name="t_std_gpg_key_id"> <xs:simpleType name="t_std_gpg_key_id">
@ -100,14 +101,6 @@
<xs:complexType name="t_std_verifyfile"> <xs:complexType name="t_std_verifyfile">
<xs:choice minOccurs="1" maxOccurs="2"> <xs:choice minOccurs="1" maxOccurs="2">
<xs:element name="gpg" minOccurs="0" maxOccurs="1" type="t_std_verify_gpg"> <xs:element name="gpg" minOccurs="0" maxOccurs="1" type="t_std_verify_gpg">
<xs:unique name="uniq_gpg_sig">
<xs:selector xpath="signature"/>
<xs:field xpath="."/>
</xs:unique>
<xs:unique name="uniq_gpg_sigfile">
<xs:selector xpath="signatureFile"/>
<xs:field xpath="."/>
</xs:unique>
</xs:element> </xs:element>
<xs:element name="hash" minOccurs="0" maxOccurs="1" type="t_std_verify_cksum"/> <xs:element name="hash" minOccurs="0" maxOccurs="1" type="t_std_verify_cksum"/>
</xs:choice> </xs:choice>
@ -121,10 +114,24 @@
</xs:complexType> </xs:complexType>


<xs:complexType name="t_std_verify_gpg"> <xs:complexType name="t_std_verify_gpg">
<xs:choice minOccurs="1" maxOccurs="1"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="t_std_gpg_sig"/> <xs:element name="sigs">
<xs:element name="signatureFile" minOccurs="0" maxOccurs="unbounded" type="t_std_uri"/> <xs:complexType>
<xs:element name="gpgKeyIDs" minOccurs="1" maxOccurs="1" type="t_std_gpg_keys"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="signature" minOccurs="0" maxOccurs="unbounded" type="t_std_gpg_sig"/>
<xs:element name="signatureFile" minOccurs="0" maxOccurs="unbounded" type="t_std_uri"/>
</xs:choice>
</xs:complexType>
<xs:unique name="uniq_gpg_sig">
<xs:selector xpath="signature"/>
<xs:field xpath="."/>
</xs:unique>
<xs:unique name="uniq_gpg_sigfile">
<xs:selector xpath="signatureFile"/>
<xs:field xpath="."/>
</xs:unique>
</xs:element>
<xs:element name="keys" minOccurs="1" maxOccurs="1" type="t_std_gpg_keys">
<xs:unique name="uniq_key_id"> <xs:unique name="uniq_key_id">
<xs:selector xpath="keyID"/> <xs:selector xpath="keyID"/>
<xs:field xpath="."/> <xs:field xpath="."/>