add database element to schema files

FZJ-JSC · Nov 2, 2022 · fdc2c11 · fdc2c11
1 parent 117cda8
commit fdc2c11
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/contrib/schema/jube.dtd b/contrib/schema/jube.dtd
@@ -127,7 +127,7 @@
 <!ELEMENT analyse ((file|include)*)>
 <!ATTLIST analyse       step CDATA #REQUIRED
                         tag CDATA #IMPLIED>
-<!ELEMENT result ((use|table|syslog|include)*)>
+<!ELEMENT result ((use|table|database|syslog|include)*)>
 <!ATTLIST result        result_dir CDATA #IMPLIED
                         tag CDATA #IMPLIED>
 <!ELEMENT table ((column|include)*)>
@@ -143,6 +143,12 @@
                         format CDATA #IMPLIED
                         title CDATA #IMPLIED
                         tag CDATA #IMPLIED>
+<!ELEMENT database ((key|include)*)>
+<!ATTLIST database      name CDATA #REQUIRED
+                        primekeys CDATA #IMPLIED
+                        file CDATA #IMPLIED
+                        filter CDATA #IMPLIED
+                        tag CDATA #IMPLIED>
 <!ELEMENT syslog ((key|include)*)>
 <!ATTLIST syslog        name CDATA #REQUIRED
                         address CDATA #IMPLIED

diff --git a/contrib/schema/jube.rnc b/contrib/schema/jube.rnc
@@ -177,7 +177,7 @@ analyse = element analyse { attlist.analyse, (file | \include)* }
 attlist.analyse &=
   attribute step { text },
   attribute tag { text }?
-result = element result { attlist.result, (use | table | syslog | \include)* }
+result = element result { attlist.result, (use | table |database | syslog | \include)* }
 attlist.result &=
   attribute result_dir { text }?,
   attribute tag { text }?
@@ -190,6 +190,13 @@ attlist.table &=
   attribute sort { text }?,
   attribute filter { text }?,
   attribute tag { text }?
+database = element database { attlist.database, (key | \include)* }
+attlist.database &=
+  attribute name { text },
+  attribute primekeys { text }?,
+  attribute file { text }?,
+  attribute filter { text }?,
+  attribute tag { text }?
 syslog = element syslog { attlist.syslog, (key | \include)* }
 attlist.syslog &=
   attribute name { text },

diff --git a/contrib/schema/jube.xsd b/contrib/schema/jube.xsd
@@ -218,6 +218,7 @@
     <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element name="use" type="stringTagType" />
         <xs:element name="table" type="tableType" />
+	<xs:element name="database" type="databaseType" />
         <xs:element name="syslog" type="syslogType" />
         <xs:element name="include" type="includeType" />
     </xs:choice>
@@ -239,6 +240,18 @@
     <xs:attribute name="tag" type="xs:string" use="optional" />
   </xs:complexType>
 
+  <xs:complexType name="databaseType">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="key" type="stringTagType" />
+      <xs:element name="include" type="includeType" />
+    </xs:choice>
+    <xs:attribute name="name" type="xs:string" use="required" />
+    <xs:attribute name="primekeys" type="xs:string" use="optional" />
+    <xs:attribute name="file" type="xs:string" use="optional" />
+    <xs:attribute name="filter" type="xs:string" use="optional" />
+    <xs:attribute name="tag" type="xs:string" use="optional" />
+  </xs:complexType>
+
   <xs:complexType name="syslogType">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="key" type="columnType" />