Add rules for Array_1D_Spectrum

Author: mace-space

ChangeLog.md

@@ -1,5 +1,10 @@
 # Spectral Discipline Namespace Change Log
 
+## Changes from v1.3.2.0.to v1.3.2.1
+
+Added rules for Array_1D_Spectrum that were overlooked in [CCB#42](https://github.com/NASA-PDS/PDS4-CCB/issues/42). 
+Added VALID and FAIL tests for Array_1D_Spectrum.
+
 ## Changes from v1.3.1.1 to v1.3.2.0
 
 ### Issue #278: Port Documentation

src/PDS4_SPECTRAL_IngestLDD.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1H00.sch" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-model href="http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1O00.sch" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 
 <Ingest_LDD xmlns="http://pds.nasa.gov/pds4/pds/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1 http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1H00.xsd">
+    xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1 http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1O00.xsd">
     <name>Spectral Discipline Dictionary</name>
-    <ldd_version_id>1.3.2.0</ldd_version_id>
+    <ldd_version_id>1.3.2.1</ldd_version_id>
     <dictionary_type>Discipline</dictionary_type>
     <full_name>Anne Raugh</full_name>
     <steward_id>sbn</steward_id>
@@ -44,8 +44,11 @@
           2024-04-02  ACR   Version 1.3.2.0  Clearing some additional issues from the queue:
                                              Issue #275: Conside units when comparing values of first_center_*
                                                 and last_center_*
+          2025-10-21  MJTM  Version 1.3.2.1  Bug fix – add missing schematron rules for Array_1D_Spectrum 
+                                             (Overlooked in CCB#42)
+
     </comment>
-    <last_modification_date_time>2024-04-02</last_modification_date_time>
+    <last_modification_date_time>2025-10-21</last_modification_date_time>
     <!--
         This file also contains extensive comments to illustrate various techniques available to those
         creating input IngestLDD files for local dicitionaries.  
@@ -3087,14 +3090,14 @@
                 The empty parentheses are required.  This ensures that if the local_reference_type check fails
                 (i.e., we're not looking at an array type), no message is reported.
             -->
-            <rule_test>if (pds:local_reference_type = ('spectral_characteristics_to_array_object')) then ($objtype = ('Array_2D_Spectrum', 'Array_3D_Spectrum')) else true()</rule_test>
+            <rule_test>if (pds:local_reference_type = ('spectral_characteristics_to_array_object')) then ($objtype = ('Array_1D_Spectrum', 'Array_2D_Spectrum', 'Array_3D_Spectrum')) else true()</rule_test>
             <!--
                 Because this is an Assert-type test, this message will be printed if the test fails.  
                 Another aspect of "good citizenship" is making it easy for the user to see and correct
                 what he did wrong, so including the full list of valid values for something like this
                 is strongly recommended.
             -->
-            <rule_message>The Array-type object referenced by sp:Spectral_Characteristics must be either an Array_2D_Spectrum or an Array_3D_Spectrum.</rule_message>
+            <rule_message>The Array-type object referenced by sp:Spectral_Characteristics must be either an Array_1D_Spectrum, Array_2D_Spectrum, or an Array_3D_Spectrum.</rule_message>
             <!--
                 This is an optional description field for your own use.  It is not propagated to the 
                 Schematron or Schema files created.
@@ -3152,8 +3155,8 @@
         </DD_Rule_Statement>
         <DD_Rule_Statement>
             <rule_type>Assert</rule_type>
-            <rule_test>if (string(node()) = '1D') then ($objtype = ('Table_Character','Table_Binary','Table_Delimited')) else true()</rule_test>
-            <rule_message>sp:spectrum_format of '1D' must be used with a table-type object.</rule_message>
+            <rule_test>if (string(node()) = '1D') then ($objtype = ('Array_1D_Spectrum', 'Table_Character','Table_Binary','Table_Delimited')) else true()</rule_test>
+            <rule_message>sp:spectrum_format of '1D' must be used with an Array_1D_Spectrum-type object or a table-type object.</rule_message>
         </DD_Rule_Statement>
         <DD_Rule_Statement>
             <rule_type>Assert</rule_type>