More fixed metapaths in keys.

usnistgov · Aug 23, 2021 · 700b138 · 700b138
1 parent f47b867
commit 700b138
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
@@ -581,7 +581,7 @@
                         <key-field target="@role-id"></key-field>
                   </index-has-key>
                   <index-has-key name="index-metadata-party-uuid" target="responsible-party">
-                        <key-field target="@party-uuid"></key-field>
+                        <key-field target="party-uuid"></key-field>
                   </index-has-key>
                   <is-unique id="unique-inventory-item-responsible-party" target="responsible-party">
                         <key-field target="@role-id"/>

diff --git a/src/metaschema/oscal_metadata_metaschema.xml b/src/metaschema/oscal_metadata_metaschema.xml
@@ -69,8 +69,8 @@
                 <key-field target="@class"/>
                 <key-field target="@value"/>
             </is-unique>
-            <index id="index-metadata-property-id" name="index-metadata-property-id" target=".//prop">
-                <key-field target="@id"/>
+            <index id="index-metadata-property-uuid" name="index-metadata-property-uuid" target=".//prop">
+                <key-field target="@uuid"/>
             </index>
             <is-unique id="unique-metadata-link" target="link">
                 <key-field target="@href"/>

diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml
@@ -727,10 +727,10 @@
             &allowed-values-responsible-roles-operations;
       </allowed-values>
       <index-has-key name="index-metadata-role-id" target="responsible-role|statement/responsible-role|.//by-component//responsible-role">
-        <key-field target="@role-id"></key-field>
+        <key-field target="@role-id"/>
       </index-has-key>
       <index-has-key name="index-metadata-party-uuid" target="responsible-role|statement/responsible-role|.//by-component//responsible-role">
-        <key-field target="@party-uuid"></key-field>
+        <key-field target="party-uuid"/>
       </index-has-key>
       <has-cardinality target=".//by-component" min-occurs="1">
         <remarks>