Skip to content

Commit

Permalink
Merge pull request #14 from findologic/FINDO-9402_Add_optional_visibi…
Browse files Browse the repository at this point in the history
…lities_element

Add optional visibilities element (FINDO-9402).
  • Loading branch information
howard authored Apr 14, 2022
2 parents 0e7f68e + ac084ce commit b0078f4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.findologic</groupId>
<artifactId>xml-export</artifactId>
<packaging>jar</packaging>
<version>1.5.1-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<name>xml-export</name>
<url>http://maven.apache.org</url>
</project>
30 changes: 22 additions & 8 deletions src/main/resources/findologic.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,18 @@
<!-- Optional -->
<xs:element type="bonusesType" name="bonuses" minOccurs="0" maxOccurs="1"/>
<xs:element type="sortsType" name="sorts" minOccurs="0" maxOccurs="1"/>
<xs:element type="visibilitiesType" name="visibilities" minOccurs="0" maxOccurs="1"/>
</xs:all>
<xs:attribute type="nonEmptyString" name="id" use="required"/>
</xs:complexType>

<!-- Images -->
<xs:complexType name="allImagesType">
<xs:sequence>
<xs:element type="imagesType" name="images" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>

<xs:complexType name="imagesType">
<xs:sequence>
<xs:element type="imageType" name="image" minOccurs="0" maxOccurs="unbounded"/>
Expand All @@ -80,7 +81,7 @@
<!-- Keywords -->
<xs:complexType name="allKeywordsType">
<xs:sequence>
<xs:element name="keywords" minOccurs="0" maxOccurs="unbounded" >
<xs:element name="keywords" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:element type="xs:string" name="keyword" maxOccurs="unbounded" minOccurs="0"/>
Expand All @@ -90,7 +91,7 @@
</xs:element>
</xs:sequence>
</xs:complexType>

<!-- Properties -->
<xs:complexType name="allPropertiesType">
<xs:sequence>
Expand Down Expand Up @@ -240,10 +241,10 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element type="attributeValues" name="values"/>
<xs:element type="attributeValues" name="values"/>
</xs:sequence>
</xs:complexType>

<!-- Generic structure for key-value-pair elements -->
<xs:complexType name="keyValuePair">
<xs:sequence>
Expand Down Expand Up @@ -290,11 +291,10 @@
</xs:element>
</xs:sequence>
</xs:complexType>


<xs:complexType name="usergroupsType">
<xs:sequence>
<xs:element type="usergroupHash" name="usergroup" minOccurs="0" maxOccurs="unbounded" />
<xs:element type="usergroupHash" name="usergroup" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>

Expand Down Expand Up @@ -340,4 +340,18 @@
</xs:sequence>
</xs:complexType>

<xs:complexType name="visibilitiesType">
<xs:sequence>
<xs:element name="visible" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:boolean">
<xs:attribute type="usergroupHash" name="usergroup" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>

</xs:schema>

0 comments on commit b0078f4

Please sign in to comment.