From 03b9254164f7612badc07f84676c7921e455fdcc Mon Sep 17 00:00:00 2001
From: Wendell Piez <wapiez@wendellpiez.com>
Date: Mon, 10 Jun 2019 12:32:26 -0400
Subject: [PATCH] Repaired error in profile metaschema, with Schematron check
 to detect it (#6)

---
 build/metaschema/lib/metaschema-check.sch   |  6 +++---
 src/metaschema/oscal_profile_metaschema.xml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/metaschema/lib/metaschema-check.sch b/build/metaschema/lib/metaschema-check.sch
index 7a928c3820..55b94df2b3 100644
--- a/build/metaschema/lib/metaschema-check.sch
+++ b/build/metaschema/lib/metaschema-check.sch
@@ -92,9 +92,9 @@
             <sch:let name="decl" value="key('definition-by-name',@named,$composed-metaschema)"/>
             <sch:assert test="exists($decl)">No definition found for '<sch:value-of select="@named"/>' <sch:value-of select="local-name()"/></sch:assert>
             <sch:assert role="warning" test="empty($decl) or exists(self::m:field|self::m:assembly) or exists($decl/@group-as)">Reference is made to <sch:value-of select="local-name()"/> '<sch:value-of select="@named"/>', but their definition does not give a group name.</sch:assert>
-            <sch:assert test="empty($decl) or empty(@address) or ($decl/@address = @address)">The referenced definition has <sch:value-of select="if (exists($decl/@address)) then ('address ''' || $decl/@address || '''') else 'no address'"/></sch:assert>
-            <sch:assert test="exists($decl/@acquire-from) or empty(@address) or ($decl/m:flag/@name = @address)">The referenced definition has no flag named '<sch:value-of select="@address"/>'</sch:assert>
-            <sch:assert test="empty($decl/@acquire-from) or empty(@address) or not($decl/m:flag/@name = @address) or ($decl/m:flag[@name = current()/@address]/@required='yes')">The target definition has no required flag named <sch:value-of select="@address"/></sch:assert>
+            <sch:assert test="(empty($decl/@address) and empty(@address)) or ($decl/@address = @address)">The referenced definition has <sch:value-of select="if (exists($decl/@address)) then ('address ''' || $decl/@address || '''') else 'no address'"/></sch:assert>
+            <!--<sch:assert test="exists($decl/@acquire-from) or empty(@address) or ($decl/m:flag/@name = @address)">The referenced definition has no flag named '<sch:value-of select="@address"/>'</sch:assert>
+            <sch:assert test="empty($decl/@acquire-from) or empty(@address) or not($decl/m:flag/@name = @address) or ($decl/m:flag[@name = current()/@address]/@required='yes')">The target definition has no required flag named <sch:value-of select="@address"/></sch:assert>-->
             
             
             <sch:report test="@named = ../(* except current())/@named">Everything named the same must appear together</sch:report>
diff --git a/src/metaschema/oscal_profile_metaschema.xml b/src/metaschema/oscal_profile_metaschema.xml
index 301ebe01a2..5c78f706d6 100644
--- a/src/metaschema/oscal_profile_metaschema.xml
+++ b/src/metaschema/oscal_profile_metaschema.xml
@@ -149,7 +149,7 @@
       <formal-name>Modify controls</formal-name>
       <description>Set parameters or amend controls in resolution</description>
       <model>
-         <assemblies named="set"/>
+         <assemblies named="set" address="param-id"/>
          <assemblies named="alter"/>
       </model>
    </define-assembly>
@@ -354,12 +354,12 @@
       <formal-name>Addition</formal-name>
       <description>Specifies contents to be added into controls or subcontrols, in resolution</description>
       <model>
-         <field named="title"/>
+         <field      named="title"/>
          <assemblies named="param" address="id"/>
-         <fields named="prop"/>
-         <fields named="link"/>
+         <fields     named="prop"/>
+         <fields     named="link"/>
          <assemblies named="part"/>
-         <assembly named="citation-list"/>
+         <assembly   named="citation-list"/>
       </model>
    </define-assembly>
    <define-flag datatype="NCName" name="control-id">