Skip to content

Commit

Permalink
Merge pull request #21 from pds-data-dictionaries/hotfix/bias_map_sch…
Browse files Browse the repository at this point in the history
…_rule

Fix `reference_type` of `Bias_Map` in docs and tests
  • Loading branch information
acraugh authored Aug 15, 2024
2 parents 95ff451 + f7f9d5d commit 8b48110
Show file tree
Hide file tree
Showing 72 changed files with 1,656 additions and 196 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 Schematron for Name Space Id:sb Version:1.1.0.0 - Tue Jun 25 15:45:37 UTC 2024 -->
<!-- PDS4 Schematron for Name Space Id:sb Version:1.1.1.0 - Thu Aug 15 14:08:06 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.19.0.0 - System Build 13.0 -->
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
Expand Down Expand Up @@ -48,7 +48,7 @@
</sch:pattern>
<sch:pattern>
<sch:rule context="sb:Bias_Map/pds:Internal_Reference">
<sch:assert test="pds:reference_type eq 'image_to_bias_levels'">
<sch:assert test="pds:reference_type eq 'image_to_bias_map_file'">
<title>sb:Bias_Map/pds:Internal_Reference/Rule</title>
In sb:Bias_Map/pds:Internal_Reference, pds:reference_type must be "image_to_bias_map_file".</sch:assert>
</sch:rule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ PDS4 Local Data Dictionary Processing Report

Configuration:
LDDTool Version 15.1.0
LDD Version Id: 1.1.0.0
LDD Version Id: 1.1.1.0
LDD Label Version Id: 1.25
LDD Discipline (T/F): true
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Tue Jun 25 15:45:37 UTC 2024
Time Thu Aug 15 14:08:06 UTC 2024
Common Schema [PDS4_PDS_1J00.xsd]
Common Schematron [PDS4_PDS_1J00.sch]
IM Version Id: 1.19.0.0
Expand Down Expand Up @@ -39,7 +39,7 @@ Detailed validation messages

Parsed Input - Header:
LDD Name Small Bodies Studies
LDD Version 1.1.0.0
LDD Version 1.1.1.0
Full Name Anne Raugh
Steward sbn
Namespace Id sb
Expand All @@ -51,6 +51,11 @@ Parsed Input - Header:

The initials "ACR" in the "submitter" field indicate Anne Raugh.

version 1.1.1.0 2024-08-07
- Fixed a bug whereby the reference_type value enforced by the 'bias_ir' schematron
rule did not match the rule message, class name, or other calibration file reference
classes.

version 1.1.0 2024-06-23
- Added dead_time_correction, effective_area_correction, smear_removal_applied, and
wavelength_solution_applied attributes, which are boolean checks that should be
Expand All @@ -65,7 +70,7 @@ Parsed Input - Header:
- Added x_axis_position_angle attribute to Instrument_Position_Angles class along
with schematron rules requiring exactly 2 of the 3 attributes in that class.

Last Modification Time 2024-06-23
Last Modification Time 2024-08-07
PDS4 Merge Flag false

Parsed Input - Attributes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 XML product label for PDS4 V1.19.0.0 Tue Jun 25 15:45:37 UTC 2024 -->
<!-- PDS4 XML product label for PDS4 V1.19.0.0 Thu Aug 15 14:08:06 UTC 2024 -->
<!-- Generated from the PDS4 Information Model V1.19.0.0 - System Build 13.0 -->
<!-- *** This PDS4 XML product label is an operational deliverable. *** -->
<?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1J00.sch"
Expand All @@ -10,42 +10,42 @@
xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1
https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1J00.xsd">
<Identification_Area>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:sb-xml_schema_1.19.0.0_1.1.0.0</logical_identifier>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:sb-xml_schema_1.19.0.0_1.1.1.0</logical_identifier>
<version_id>1.25</version_id>
<title>PDS4 XML Schema - SB V1.1.0.0</title>
<title>PDS4 XML Schema - SB V1.1.1.0</title>
<information_model_version>1.19.0.0</information_model_version>
<product_class>Product_XML_Schema</product_class>
<Modification_History>
<Modification_Detail>
<modification_date>2024-06-25</modification_date>
<modification_date>2024-08-15</modification_date>
<version_id>1.25</version_id>
<description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
</Modification_Detail>
</Modification_History>
</Identification_Area>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SB_1J00_1100.xsd</file_name>
<creation_date_time>2024-06-25T08:45:37</creation_date_time>
<file_size unit="byte">66363</file_size>
<records>1394</records>
<file_name>PDS4_SB_1J00_1110.xsd</file_name>
<creation_date_time>2024-08-15T07:08:06</creation_date_time>
<file_size unit="byte">66596</file_size>
<records>1399</records>
</File>
<XML_Schema>
<name>PDS4_SB_1J00_1100.xsd</name>
<name>PDS4_SB_1J00_1110.xsd</name>
<offset unit="byte">0</offset>
<parsing_standard_id>XML Schema Version 1.1</parsing_standard_id>
<description>This is a PDS4 XML Schema file for the declared namespace.</description>
</XML_Schema>
</File_Area_XML_Schema>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SB_1J00_1100.sch</file_name>
<creation_date_time>2024-06-25T08:45:37</creation_date_time>
<file_size unit="byte">18329</file_size>
<file_name>PDS4_SB_1J00_1110.sch</file_name>
<creation_date_time>2024-08-15T07:08:06</creation_date_time>
<file_size unit="byte">18331</file_size>
<records>301</records>
</File>
<XML_Schema>
<name>PDS4_SB_1J00_1100.sch</name>
<name>PDS4_SB_1J00_1110.sch</name>
<offset unit="byte">0</offset>
<parsing_standard_id>Schematron ISO/IEC 19757-3:2006</parsing_standard_id>
<description>This is the PDS4 Schematron file for the declared namespace. Schematron provides rule-based validation for XML Schema.</description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 XML/Schema for Name Space Id:sb Version:1.1.0.0 - Tue Jun 25 15:45:37 UTC 2024 -->
<!-- PDS4 XML/Schema for Name Space Id:sb Version:1.1.1.0 - Thu Aug 15 14:08:06 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.19.0.0 - System Build 13.0 -->
<!-- *** This PDS4 product schema is an operational deliverable. *** -->
<!-- -->
<!-- Dictionary Stack -->
<!-- 1.19.0.0 - pds: - Common Dictionary -->
<!-- 1.1.0.0 - sb: - Small Bodies Studies -->
<!-- 1.1.1.0 - sb: - Small Bodies Studies -->
<!-- -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://pds.nasa.gov/pds4/sb/v1"
xmlns:sb="http://pds.nasa.gov/pds4/sb/v1"
xmlns:pds="http://pds.nasa.gov/pds4/pds/v1"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.1.0.0">
version="1.1.1.0">

<xs:import namespace="http://pds.nasa.gov/pds4/pds/v1" schemaLocation="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1J00.xsd"/>

Expand All @@ -27,6 +27,11 @@

The initials "ACR" in the "submitter" field indicate Anne Raugh.

version 1.1.1.0 2024-08-07
- Fixed a bug whereby the reference_type value enforced by the 'bias_ir' schematron
rule did not match the rule message, class name, or other calibration file reference
classes.

version 1.1.0 2024-06-23
- Added dead_time_correction, effective_area_correction, smear_removal_applied, and
wavelength_solution_applied attributes, which are boolean checks that should be
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 Schematron for Name Space Id:sb Version:1.1.0.0 - Tue Jun 25 15:45:37 UTC 2024 -->
<!-- PDS4 Schematron for Name Space Id:sb Version:1.1.1.0 - Thu Aug 15 14:08:06 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.20.0.0 - System Build 13.1 -->
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
Expand Down Expand Up @@ -48,7 +48,7 @@
</sch:pattern>
<sch:pattern>
<sch:rule context="sb:Bias_Map/pds:Internal_Reference">
<sch:assert test="pds:reference_type eq 'image_to_bias_levels'">
<sch:assert test="pds:reference_type eq 'image_to_bias_map_file'">
<title>sb:Bias_Map/pds:Internal_Reference/Rule</title>
In sb:Bias_Map/pds:Internal_Reference, pds:reference_type must be "image_to_bias_map_file".</sch:assert>
</sch:rule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ PDS4 Local Data Dictionary Processing Report

Configuration:
LDDTool Version 15.1.0
LDD Version Id: 1.1.0.0
LDD Version Id: 1.1.1.0
LDD Label Version Id: 1.26
LDD Discipline (T/F): true
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Tue Jun 25 15:45:37 UTC 2024
Time Thu Aug 15 14:08:06 UTC 2024
Common Schema [PDS4_PDS_1K00.xsd]
Common Schematron [PDS4_PDS_1K00.sch]
IM Version Id: 1.20.0.0
Expand Down Expand Up @@ -39,7 +39,7 @@ Detailed validation messages

Parsed Input - Header:
LDD Name Small Bodies Studies
LDD Version 1.1.0.0
LDD Version 1.1.1.0
Full Name Anne Raugh
Steward sbn
Namespace Id sb
Expand All @@ -51,6 +51,11 @@ Parsed Input - Header:

The initials "ACR" in the "submitter" field indicate Anne Raugh.

version 1.1.1.0 2024-08-07
- Fixed a bug whereby the reference_type value enforced by the 'bias_ir' schematron
rule did not match the rule message, class name, or other calibration file reference
classes.

version 1.1.0 2024-06-23
- Added dead_time_correction, effective_area_correction, smear_removal_applied, and
wavelength_solution_applied attributes, which are boolean checks that should be
Expand All @@ -65,7 +70,7 @@ Parsed Input - Header:
- Added x_axis_position_angle attribute to Instrument_Position_Angles class along
with schematron rules requiring exactly 2 of the 3 attributes in that class.

Last Modification Time 2024-06-23
Last Modification Time 2024-08-07
PDS4 Merge Flag false

Parsed Input - Attributes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 XML product label for PDS4 V1.20.0.0 Tue Jun 25 15:45:37 UTC 2024 -->
<!-- PDS4 XML product label for PDS4 V1.20.0.0 Thu Aug 15 14:08:06 UTC 2024 -->
<!-- Generated from the PDS4 Information Model V1.20.0.0 - System Build 13.1 -->
<!-- *** This PDS4 XML product label is an operational deliverable. *** -->
<?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1K00.sch"
Expand All @@ -10,42 +10,42 @@
xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1
https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1K00.xsd">
<Identification_Area>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:sb-xml_schema_1.20.0.0_1.1.0.0</logical_identifier>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:sb-xml_schema_1.20.0.0_1.1.1.0</logical_identifier>
<version_id>1.26</version_id>
<title>PDS4 XML Schema - SB V1.1.0.0</title>
<title>PDS4 XML Schema - SB V1.1.1.0</title>
<information_model_version>1.20.0.0</information_model_version>
<product_class>Product_XML_Schema</product_class>
<Modification_History>
<Modification_Detail>
<modification_date>2024-06-25</modification_date>
<modification_date>2024-08-15</modification_date>
<version_id>1.26</version_id>
<description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
</Modification_Detail>
</Modification_History>
</Identification_Area>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SB_1K00_1100.xsd</file_name>
<creation_date_time>2024-06-25T08:45:37</creation_date_time>
<file_size unit="byte">66363</file_size>
<records>1394</records>
<file_name>PDS4_SB_1K00_1110.xsd</file_name>
<creation_date_time>2024-08-15T07:08:06</creation_date_time>
<file_size unit="byte">66596</file_size>
<records>1399</records>
</File>
<XML_Schema>
<name>PDS4_SB_1K00_1100.xsd</name>
<name>PDS4_SB_1K00_1110.xsd</name>
<offset unit="byte">0</offset>
<parsing_standard_id>XML Schema Version 1.1</parsing_standard_id>
<description>This is a PDS4 XML Schema file for the declared namespace.</description>
</XML_Schema>
</File_Area_XML_Schema>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SB_1K00_1100.sch</file_name>
<creation_date_time>2024-06-25T08:45:37</creation_date_time>
<file_size unit="byte">18473</file_size>
<file_name>PDS4_SB_1K00_1110.sch</file_name>
<creation_date_time>2024-08-15T07:08:06</creation_date_time>
<file_size unit="byte">18475</file_size>
<records>301</records>
</File>
<XML_Schema>
<name>PDS4_SB_1K00_1100.sch</name>
<name>PDS4_SB_1K00_1110.sch</name>
<offset unit="byte">0</offset>
<parsing_standard_id>Schematron ISO/IEC 19757-3:2006</parsing_standard_id>
<description>This is the PDS4 Schematron file for the declared namespace. Schematron provides rule-based validation for XML Schema.</description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 XML/Schema for Name Space Id:sb Version:1.1.0.0 - Tue Jun 25 15:45:37 UTC 2024 -->
<!-- PDS4 XML/Schema for Name Space Id:sb Version:1.1.1.0 - Thu Aug 15 14:08:06 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.20.0.0 - System Build 13.1 -->
<!-- *** This PDS4 product schema is an operational deliverable. *** -->
<!-- -->
<!-- Dictionary Stack -->
<!-- 1.20.0.0 - pds: - Common Dictionary -->
<!-- 1.1.0.0 - sb: - Small Bodies Studies -->
<!-- 1.1.1.0 - sb: - Small Bodies Studies -->
<!-- -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://pds.nasa.gov/pds4/sb/v1"
xmlns:sb="http://pds.nasa.gov/pds4/sb/v1"
xmlns:pds="http://pds.nasa.gov/pds4/pds/v1"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.1.0.0">
version="1.1.1.0">

<xs:import namespace="http://pds.nasa.gov/pds4/pds/v1" schemaLocation="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1K00.xsd"/>

Expand All @@ -27,6 +27,11 @@

The initials "ACR" in the "submitter" field indicate Anne Raugh.

version 1.1.1.0 2024-08-07
- Fixed a bug whereby the reference_type value enforced by the 'bias_ir' schematron
rule did not match the rule message, class name, or other calibration file reference
classes.

version 1.1.0 2024-06-23
- Added dead_time_correction, effective_area_correction, smear_removal_applied, and
wavelength_solution_applied attributes, which are boolean checks that should be
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 Schematron for Name Space Id:sb Version:1.1.0.0 - Tue Jun 25 15:45:36 UTC 2024 -->
<!-- PDS4 Schematron for Name Space Id:sb Version:1.1.1.0 - Thu Aug 15 14:08:38 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.21.0.0 - System Build 14.0 -->
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
Expand Down Expand Up @@ -48,7 +48,7 @@
</sch:pattern>
<sch:pattern>
<sch:rule context="sb:Bias_Map/pds:Internal_Reference">
<sch:assert test="pds:reference_type eq 'image_to_bias_levels'">
<sch:assert test="pds:reference_type eq 'image_to_bias_map_file'">
<title>sb:Bias_Map/pds:Internal_Reference/Rule</title>
In sb:Bias_Map/pds:Internal_Reference, pds:reference_type must be "image_to_bias_map_file".</sch:assert>
</sch:rule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ PDS4 Local Data Dictionary Processing Report

Configuration:
LDDTool Version 15.1.0
LDD Version Id: 1.1.0.0
LDD Version Id: 1.1.1.0
LDD Label Version Id: 1.27
LDD Discipline (T/F): true
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Tue Jun 25 15:45:36 UTC 2024
Time Thu Aug 15 14:08:38 UTC 2024
Common Schema [PDS4_PDS_1L00.xsd]
Common Schematron [PDS4_PDS_1L00.sch]
IM Version Id: 1.21.0.0
Expand Down Expand Up @@ -39,7 +39,7 @@ Detailed validation messages

Parsed Input - Header:
LDD Name Small Bodies Studies
LDD Version 1.1.0.0
LDD Version 1.1.1.0
Full Name Anne Raugh
Steward sbn
Namespace Id sb
Expand All @@ -51,6 +51,11 @@ Parsed Input - Header:

The initials "ACR" in the "submitter" field indicate Anne Raugh.

version 1.1.1.0 2024-08-07
- Fixed a bug whereby the reference_type value enforced by the 'bias_ir' schematron
rule did not match the rule message, class name, or other calibration file reference
classes.

version 1.1.0 2024-06-23
- Added dead_time_correction, effective_area_correction, smear_removal_applied, and
wavelength_solution_applied attributes, which are boolean checks that should be
Expand All @@ -65,7 +70,7 @@ Parsed Input - Header:
- Added x_axis_position_angle attribute to Instrument_Position_Angles class along
with schematron rules requiring exactly 2 of the 3 attributes in that class.

Last Modification Time 2024-06-23
Last Modification Time 2024-08-07
PDS4 Merge Flag false

Parsed Input - Attributes:
Expand Down
Loading

0 comments on commit 8b48110

Please sign in to comment.