Merge pull request #199 from ivoa-std/update/to_rec

Update/to rec

Author: lmichel

doc/Makefile

@@ -7,7 +7,7 @@ DOCNAME = mivot
 DOCVERSION = 1.0
 
 # Publication date, ISO format; update manually for "releases"
-DOCDATE = 2023-04-26
+DOCDATE = 2023-06-08
 
 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
 DOCTYPE = REC

schema/xsd/mivot-v1.0.xsd

@@ -190,17 +190,6 @@
         <xs:attribute type="xs:string" name="dmid" />
         <xs:assert
             test="if (@dmid) then ( @dmid != '') else true()  " />
-        <!-- LM ORIGINAL <xs:assert test="(count(dm-mapping:ATTRIBUTE) eq 0 and 
-            count(dm-mapping:REFERENCE) >= 0) or count(dm-mapping:ATTRIBUTE) > 0 and 
-            count(dm-mapping:REFERENCE) = 0"/> <xs:assert test="(count(dm-mapping:ATTRIBUTE) 
-            eq 0 and count(dm-mapping:INSTANCE) >= 0) or count(dm-mapping:ATTRIBUTE) 
-            > 0 and count(dm-mapping:INSTANCE) = 0"/> <xs:assert test="(count(dm-mapping:ATTRIBUTE) 
-            eq 0 and count(dm-mapping:JOIN) >= 0) or count(dm-mapping:ATTRIBUTE) > 0 
-            and count(dm-mapping:JOIN) = 0"/> <xs:assert test="(count(dm-mapping:ATTRIBUTE) 
-            eq 0 and count(dm-mapping:COLLECTION) >= 0) or count(dm-mapping:ATTRIBUTE) 
-            > 0 and count(dm-mapping:COLLECTION) = 0"/> -->
-        <!-- collection of (attribute)||(reference)||(instance+join)||(collection) -->
-        <!-- - contains some redundancies, but will work if order of checks changes -->
 
         <xs:assert
             test="if (count(dm-mapping:JOIN) > 0 ) then (count(dm-mapping:REFERENCE) = 0) else true()" />