Julian Date check fix - again

Tested new syntax (from Jordan) and added some lines to the associated regression test to flag unexpected side-effects. Added version 1.19.0.0 to compatible LDD generation list to support NH migration. Fixed typo in test/README
pds-data-dictionaries · Dec 20, 2023 · 96c7ce5 · 96c7ce5
1 parent 406aa02
commit 96c7ce5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/pds4_versions.txt b/pds4_versions.txt
@@ -1,2 +1,3 @@
+1.19.0.0
 1.20.0.0
 1.21.0.0
diff --git a/src/PDS4_SB_IngestLDD.xml b/src/PDS4_SB_IngestLDD.xml
@@ -2156,7 +2156,7 @@
 
   <DD_Rule>
     <local_identifier>julian_units_check</local_identifier>
-    <rule_context>descendant::sb:SB_Metadata[ends-with(name(),'_JD')]</rule_context>
+    <rule_context>sb:SB_Metadata//*[ends-with(name(),'_JD')]</rule_context>
     <DD_Rule_Statement>
       <rule_type>Assert</rule_type>
       <rule_test>@unit eq 'julian day'</rule_test>

diff --git a/test/README.md b/test/README.md
@@ -22,6 +22,6 @@ Tests for individual key features are provided in VALID/FAIL pairs:
 
 **julian_dates_unit_check**
 
-  These files demonstrate that every attribute that is identified as contains a 
+  These files demonstrate that every attribute that is identified as containing a 
   Julian date formatted time (they all have names ending in "_JD") has "julian day"
   as the value of its unit attribute, and not some other valid *Units_of_Time* value.
diff --git a/test/julian_dates_unit_check_FAIL.xml b/test/julian_dates_unit_check_FAIL.xml
@@ -49,9 +49,11 @@
                 <sb:Observation_Parameters>
 
                     <sb:Timing>
+                        <sb:midobservation_time_UTC_YMD>2023-12-25T01:23:45Z</sb:midobservation_time_UTC_YMD>
                         <sb:midobservation_time_UTC_JD unit="s">2459959.1234</sb:midobservation_time_UTC_JD>
                         <sb:start_time_UTC_JD unit="day">2459959.1111</sb:start_time_UTC_JD>
                         <sb:stop_time_UTC_JD unit="hr">2459959.2222</sb:stop_time_UTC_JD>
+                        <sb:comment>some text</sb:comment>
                     </sb:Timing>
                 </sb:Observation_Parameters>
 

diff --git a/test/julian_dates_unit_check_VALID.xml b/test/julian_dates_unit_check_VALID.xml
@@ -46,9 +46,11 @@
                 <sb:Observation_Parameters>
 
                     <sb:Timing>
+                        <sb:midobservation_time_UTC_YMD>2023-12-25T01:23:45Z</sb:midobservation_time_UTC_YMD>
                         <sb:midobservation_time_UTC_JD unit="julian day">2459959.1234</sb:midobservation_time_UTC_JD>
                         <sb:start_time_UTC_JD unit="julian day">2459959.1111</sb:start_time_UTC_JD>
                         <sb:stop_time_UTC_JD unit="julian day">2459959.2222</sb:stop_time_UTC_JD>
+                        <sb:comment>some text</sb:comment>
                     </sb:Timing>
                 </sb:Observation_Parameters>
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
+.19.0.0
 .20.0.0
 .21.0.0