Version for review 20221025

xatapult · Oct 25, 2022 · 1852c3f · 1852c3f
1 parent 988ad9a
commit 1852c3f
Show file tree

Hide file tree

Showing 23 changed files with 171 additions and 8 deletions.
diff --git a/exercises/da-2022-schematron-exercises.xpr b/exercises/da-2022-schematron-exercises.xpr
diff --git a/exercises/exercise-01-01/instructions.pdf b/exercises/exercise-01-01/instructions.pdf
diff --git a/exercises/exercise-02-01/instructions.pdf b/exercises/exercise-02-01/instructions.pdf
diff --git a/exercises/exercise-02-01/solution/explanation.pdf b/exercises/exercise-02-01/solution/explanation.pdf
diff --git a/exercises/exercise-02-02/instructions.pdf b/exercises/exercise-02-02/instructions.pdf
diff --git a/exercises/exercise-02-02/solution/explanation.pdf b/exercises/exercise-02-02/solution/explanation.pdf
diff --git a/exercises/exercise-02-03/instructions.pdf b/exercises/exercise-02-03/instructions.pdf
diff --git a/exercises/exercise-02-03/solution/explanation.pdf b/exercises/exercise-02-03/solution/explanation.pdf
diff --git a/exercises/exercise-02-04/instructions.pdf b/exercises/exercise-02-04/instructions.pdf
diff --git a/exercises/exercise-02-04/solution/explanation.pdf b/exercises/exercise-02-04/solution/explanation.pdf
diff --git a/exercises/exercise-02-05/instructions.pdf b/exercises/exercise-02-05/instructions.pdf
diff --git a/exercises/exercise-02-05/solution/explanation.pdf b/exercises/exercise-02-05/solution/explanation.pdf
diff --git a/exercises/exercise-03-01/input.xml b/exercises/exercise-03-01/input.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <crate type="wood">
+    <weight-kg>25</weight-kg>
+    <contents>books</contents>
+  </crate>
+
+  <crate type="wood">
+    <weight-kg>58</weight-kg>
+    <contents>books</contents>
+  </crate>
+
+  <crate type="metal">
+    <weight-kg>890</weight-kg>
+    <contents>dogfood</contents>
+  </crate>
+
+  <gastank>
+    <weight-kg>34</weight-kg>
+    <contents>nitrogen</contents>
+  </gastank>
+
+  <container>
+    <weight-kg>2536</weight-kg>
+    <contents>computers</contents>
+  </container>
+
+</manifest>
diff --git a/exercises/exercise-03-01/instructions.pdf b/exercises/exercise-03-01/instructions.pdf
diff --git a/exercises/exercise-03-01/schema.sch b/exercises/exercise-03-01/schema.sch
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt3">
+
+</schema>
diff --git a/exercises/exercise-03-01/solution/explanation.pdf b/exercises/exercise-03-01/solution/explanation.pdf
diff --git a/exercises/exercise-03-01/solution/solution.sch b/exercises/exercise-03-01/solution/solution.sch
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt3">
+
+  <pattern abstract="true" id="check-weight">
+    <!-- Parameter: $type, $maxweight -->
+    <rule context="$type">
+      <assert test="xs:integer(weight-kg) le $maxweight">This weighs too much</assert>
+    </rule>
+  </pattern>
+
+  <pattern is-a="check-weight">
+    <param name="type" value="crate[@type eq 'wood']"/>
+    <param name="maxweight" value="30"/>
+  </pattern>
+
+  <pattern is-a="check-weight">
+    <param name="type" value="container"/>
+    <param name="maxweight" value="2500"/>
+  </pattern>
+
+</schema>
diff --git a/exercises/exercise-04-01/instructions.pdf b/exercises/exercise-04-01/instructions.pdf
diff --git a/exercises/exercise-04-01/solution/explanation.pdf b/exercises/exercise-04-01/solution/explanation.pdf
diff --git a/exercises/syllabus.pdf b/exercises/syllabus.pdf
diff --git a/presentation/Schematron Tutorial DA 2022.pdf b/presentation/Schematron Tutorial DA 2022.pdf
diff --git a/presentation/Schematron Tutorial DA 2022.pptx b/presentation/Schematron Tutorial DA 2022.pptx
diff --git a/src/da-2022-schematron.xcourse.xml b/src/da-2022-schematron.xcourse.xml
@@ -598,12 +598,117 @@
 
   <section>
     <title>Abstract patterns</title>
-
+
+    <exercises>
+
+      <exercise>
+        <title>Using an abstract pattern</title>
+
+        <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+        <instructions xml:space="preserve">
+          We're going to validate the input document @input-1@:
+
+          [[[input-1]]]
+
+          Rules are:
+          - Wooden crates must weigh less than 30 kg
+          - Containers must weigh less than 2500 kg
+
+          Implement this using an abstract pattern that checks the weigth of something againts a maximum weight. 
+          Instantiate this pattern twice, once for wooden crates and once for containers.
+
+          Use the template document @template-1@ as a starting point. In oXygen, the input document @input-1@ automatically 
+          uses @template-1@ for validation.
+        </instructions>
+
+
+        <input-document id="input-1" name="input">
+          <manifest xmlns="">
+
+            <crate type="wood">
+              <weight-kg>25</weight-kg>
+              <contents>books</contents>
+            </crate>
+
+            <crate type="wood">
+              <weight-kg>58</weight-kg>
+              <contents>books</contents>
+            </crate>
+
+            <crate type="metal">
+              <weight-kg>890</weight-kg>
+              <contents>dogfood</contents>
+            </crate>
+
+            <gastank>
+              <weight-kg>34</weight-kg>
+              <contents>nitrogen</contents>
+            </gastank>
+
+            <container>
+              <weight-kg>2536</weight-kg>
+              <contents>computers</contents>
+            </container>
+
+          </manifest>
+        </input-document>
+
+
+        <template-document id="template-1" name="schema" extension="sch">
+          <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt3">
+
+          </schema>
+        </template-document>
+
+        <solution-document id="solution-1" name="solution" extension="sch">
+          <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt3">
+
+            <pattern abstract="true" id="check-weight">
+              <!-- Parameter: $type, $maxweight -->
+              <rule context="$type">
+                <assert test="xs:integer(weight-kg) le $maxweight">This weighs too much</assert>
+              </rule>
+            </pattern>
+
+            <pattern is-a="check-weight">
+              <param name="type" value="crate[@type eq 'wood']"/>
+              <param name="maxweight" value="30"/>
+            </pattern>
+
+            <pattern is-a="check-weight">
+              <param name="type" value="container"/>
+              <param name="maxweight" value="2500"/>
+            </pattern>
+
+          </schema>
+        </solution-document>
+
+        <explanation>
+          One of the possible solutions for this exercise is in @solution-1@:
+
+          [[[solution-1]]]
+
+          - The abstract pattern with identifier `check-weight` implements a weight check for some element (`$type`) against a maximum weight (`$maxweight`). 
+          - This pattern is instantiated twice: Once for wooden crates and once for containers.
+
+        </explanation>
+
+
+        <oxygen-scenarios>
+          <validate type="schematron" source-idref="input-1" schema-idref="template-1"/>
+        </oxygen-scenarios>
+
+
+      </exercise>
+
+    </exercises>
+
   </section>
 
-  
+
   <!-- ======================================================================= -->
-  
+
   <section>
     <title>Query Language Binding</title>
 
@@ -619,11 +724,15 @@
 
           [[[input-1]]]
 
-          Please change the schema:
+          A simple Schematron schema for this is in @template-1@:
+
+          [[[template-1]]]
+
+          Please change this schema:
           - The test for the `code` attribute (`starts-with(@code, /inventory-list/@depcode)`) must be moved to a separate (boolean) XSLT function.
           - Use this function in the assert's test.
 
-          Remark: to save you from having to type the XSLT namespace correctly, it is already declared on the template's root element.
+          Remark: to add the XSLT namespace, add `xmlns:xsl="http://www.w3.org/1999/XSL/Transform"` to the root element.
         </instructions>
 
 
@@ -680,9 +789,9 @@
 
           [[[solution-1]]]
 
-          - Since we're going to use XSLT elements in our Schematron schema, we have to define the XSLT namespace on the root element (and bind it here to the prefix `xsl`)
+          - Since we're going to use XSLT elements in our Schematron schema, we have to define the XSLT namespace (and bind it here to the prefix `xsl`). For technical reasons it appear on the `&lt;xsl:function&gt;` element here, but in general it's better to add it to the root element.
           - Define some namespace for the function (`#functions`) and assign it a prefix (`f`). As long as its URI doesn't clash with any of the other namespaces in use here, it doesn't matter what it is
-          - We get the department ocde upfornt. This is necessary here because an XPath function has no context item and therefore has no access to the document being validated
+          - We get the department code upfornt. This is necessary here because an XPath function has no context item and therefore has no access to the document being validated
           - Define a very simple function (`f:check-code`) with one parameter
           - And use this function in the assert's test expression