fixed cont_img.graph for test

ICRAR · Oct 25, 2021 · ee8184c · ee8184c
1 parent 6bf6a39
commit ee8184c
Show file tree

Hide file tree

Showing 11 changed files with 2,651 additions and 5 deletions.
diff --git a/DALIUGE/xml/combine.xslt b/DALIUGE/xml/combine.xslt
@@ -0,0 +1,15 @@
+<!-- XSLT script to combine the generated output into a single file. 
+     If you have xsltproc you could use:
+     xsltproc combine.xslt index.xml >all.xml
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="xml" version="1.0" indent="no" standalone="yes" />
+  <xsl:template match="/">
+    <doxygen version="{doxygenindex/@version}" xml:lang="{doxygenindex/@xml:lang}">
+      <!-- Load all doxygen generated xml files -->
+      <xsl:for-each select="doxygenindex/compound">
+        <xsl:copy-of select="document( concat( @refid, '.xml' ) )/doxygen/*" />
+      </xsl:for-each>
+    </doxygen>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/DALIUGE/xml/compound.xsd b/DALIUGE/xml/compound.xsd
diff --git a/DALIUGE/xml/index.xsd b/DALIUGE/xml/index.xsd
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+
+  <xsd:element name="doxygenindex" type="DoxygenType"/>
+
+  <xsd:complexType name="DoxygenType">
+    <xsd:sequence>
+      <xsd:element name="compound" type="CompoundType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="version" type="xsd:string" use="required"/>
+    <xsd:attribute ref="xml:lang" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="CompoundType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="member" type="MemberType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="refid" type="xsd:string" use="required"/>
+    <xsd:attribute name="kind" type="CompoundKind" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="MemberType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+    </xsd:sequence>
+    <xsd:attribute name="refid" type="xsd:string" use="required"/>
+    <xsd:attribute name="kind" type="MemberKind" use="required"/>
+  </xsd:complexType>
+
+  <xsd:simpleType name="CompoundKind">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="class"/>
+      <xsd:enumeration value="struct"/>
+      <xsd:enumeration value="union"/>
+      <xsd:enumeration value="interface"/>
+      <xsd:enumeration value="protocol"/>
+      <xsd:enumeration value="category"/>
+      <xsd:enumeration value="exception"/>
+      <xsd:enumeration value="file"/>
+      <xsd:enumeration value="namespace"/>
+      <xsd:enumeration value="group"/>
+      <xsd:enumeration value="page"/>
+      <xsd:enumeration value="example"/>
+      <xsd:enumeration value="dir"/>
+      <xsd:enumeration value="type"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="MemberKind">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="define"/>
+      <xsd:enumeration value="property"/>
+      <xsd:enumeration value="event"/>
+      <xsd:enumeration value="variable"/>
+      <xsd:enumeration value="typedef"/>
+      <xsd:enumeration value="enum"/>
+      <xsd:enumeration value="enumvalue"/>
+      <xsd:enumeration value="function"/>
+      <xsd:enumeration value="signal"/>
+      <xsd:enumeration value="prototype"/>
+      <xsd:enumeration value="friend"/>
+      <xsd:enumeration value="dcop"/>
+      <xsd:enumeration value="slot"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+</xsd:schema>
+
diff --git a/DALIUGE/xml/xml.xsd b/DALIUGE/xml/xml.xsd
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<xsd:schema targetNamespace="http://www.w3.org/XML/1998/namespace"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xml:lang="en">
+
+  <xsd:attribute name="lang" type="xsd:language">
+  </xsd:attribute>
+
+  <xsd:attribute name="space" default="preserve">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:NCName">
+        <xsd:enumeration value="default"/>
+        <xsd:enumeration value="preserve"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
+
+  <xsd:attributeGroup name="specialAttrs">
+    <xsd:attribute ref="xml:lang"/>
+    <xsd:attribute ref="xml:space"/>
+  </xsd:attributeGroup>
+
+</xsd:schema>
diff --git a/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph b/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph
@@ -2102,11 +2102,11 @@
                 },
                 {
                     "description": "",
-                    "name": "Arg10",
+                    "name": "arg10",
                     "readonly": false,
                     "text": "Arg 10",
                     "type": "Unknown",
-                    "value": ""
+                    "value": "True"
                 }
             ],
             "flipPorts": true,
@@ -2689,7 +2689,7 @@
                     "readonly": false,
                     "text": "Arg 10",
                     "type": "Unknown",
-                    "value": "True"
+                    "value": "hi"
                 }
             ],
             "flipPorts": false,

diff --git a/daliuge-translator/test/dropmake/test_lg_fill.py b/daliuge-translator/test/dropmake/test_lg_fill.py
@@ -43,7 +43,8 @@ def test_fill_lg(self):
         }
         with open(os.path.join(lg_dir, 'cont_img.graph')) as f:
             lg = pg_generator.fill(json.load(f), params)
-        for node_idx, value in zip((6, 13, 35, 41), ('1', '2', 'True', 'hi')):
+        for node_idx, value in zip((5, 12, 26, 34), ('1', '2', 'True', 'hi')):
+            print(node_idx)
             node = lg['nodeDataArray'][node_idx]
             found = None
             for field in node['fields']:

diff --git a/docs/DALIUGE/xml/combine.xslt b/docs/DALIUGE/xml/combine.xslt
@@ -0,0 +1,15 @@
+<!-- XSLT script to combine the generated output into a single file. 
+     If you have xsltproc you could use:
+     xsltproc combine.xslt index.xml >all.xml
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="xml" version="1.0" indent="no" standalone="yes" />
+  <xsl:template match="/">
+    <doxygen version="{doxygenindex/@version}" xml:lang="{doxygenindex/@xml:lang}">
+      <!-- Load all doxygen generated xml files -->
+      <xsl:for-each select="doxygenindex/compound">
+        <xsl:copy-of select="document( concat( @refid, '.xml' ) )/doxygen/*" />
+      </xsl:for-each>
+    </doxygen>
+  </xsl:template>
+</xsl:stylesheet>