528 standalone sdpi editorial content update

.ci/asciidoc-converter/build_standard.bat

@@ -0,0 +1,3 @@
+mkdir ..\..\sdpi-documents
+mkdir ..\..\sdpi-documents\sdpi-standard
+gradlew.bat run --args="--input-file ../../asciidoc/sdpi-standard.adoc --output-folder ../../sdpi-documents/sdpi-standard --backend html"

.ci/asciidoc-converter/build_supplement.bat

@@ -0,0 +1,3 @@
+mkdir ..\..\sdpi-documents
+mkdir ..\..\sdpi-documents\sdpi-supplement
+gradlew.bat run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-documents/sdpi-supplement --backend html"

.ci/asciidoc-converter/src/main/kotlin/org/sdpi/asciidoc/extension/SdpiInformationCollector.kt

@@ -979,7 +979,7 @@ class SdpiInformationCollector(
         gatherUseCaseBlocks(block, specBlocks)
 
         val useCaseOids = getOids(block, "${block.sourceLocation} -> Use case $strUseCaseId", WellKnownOid.DEV_USE_CASE_GLOBAL)
-
+        logger.info("${block.sourceLocation} use case: $strUseCaseId, oid = $useCaseOids")
         val backgroundContent: MutableList<GherkinStep> = mutableListOf()
         val scenarios: MutableList<UseCaseScenario> = mutableListOf()
         var iBlock = 0
@@ -997,6 +997,7 @@ class SdpiInformationCollector(
                 }
 
                 val scenarioOids = getOids(useCaseBlock, "${block.sourceLocation} -> Use case $strUseCaseId scenario ${oTitle.toString()}", useCaseOids)
+                logger.info("${block.sourceLocation} use case: $strUseCaseId, scenario: $oTitle, oid = $scenarioOids")
 
                 val iStepBlock = iBlock + 1
                 check(iStepBlock < specBlocks.count() && specBlocks[iStepBlock].hasRole(Roles.UseCase.STEPS.key))
@@ -1008,7 +1009,6 @@ class SdpiInformationCollector(
                 scenarios.add(UseCaseScenario(scenarioOids, oTitle.toString(), scenarioSteps))
             }
 
-
             ++iBlock
         }
 
@@ -1036,6 +1036,12 @@ class SdpiInformationCollector(
     private fun gatherUseCaseBlocks(block: StructuralNode, specBlocks: MutableList<StructuralNode>) {
         for (child in block.blocks) {
             val strRole = child.role
+
+            check(strRole != Roles.UseCase.FEATURE.key) {
+                "${child.sourceLocation} use case ${child.attributes[UseCaseAttributes.ID.key]} must not be nested inside another use case. Check heading levels."
+                    .also{logger.error{it}}
+            }
+
             when (strRole) {
                 Roles.UseCase.BACKGROUND.key -> specBlocks.add(child)
                 Roles.UseCase.SCENARIO.key -> {

CHANGELOG.md

@@ -30,6 +30,8 @@ Each section shall contain a list of action items of the following format: `<bri
 
 - History Service design, MDPWS requirements and transaction DEV-32 ([#360](https://github.com/IHE/DEV.SDPi/issues/360))
 - Clarification on SDPi-P safety requirements and considerations to explicitly include the application of the IEEE 11073-10700 standard ([#529](https://github.com/IHE/DEV.SDPi/issues/529))
+- Clarification on the use of `wsa:To` in greeting {`Hello`, `Bye`} notifications sent by a discovery proxy to a consumer ([#534](https://github.com/IHE/DEV.SDPi/issues/534)).
+- Standalone SDPi - Editorial Content Update to the Standard and Supplement documents ([#528](https://github.com/IHE/DEV.SDPi/issues/528)).
 - Clarification on the use of `wsa:To` in greeting {`Hello`, `Bye`} notifications sent by a discovery proxy to a consumer ([#534](https://github.com/IHE/DEV.SDPi/issues/534))
 - Required SDPi-P actor grouping entries for BICEPS Content Creator and BICEPS Content Consumer in TF-1:10.3 ([#476](https://github.com/IHE/DEV.SDPi/issues/476))
 - Support for semantic markup for deprecating requirements, transactions, use-cases, profiles, content modules and actors ([#511](https://github.com/IHE/DEV.SDPi/issues/511))

asciidoc/volume1/conformance-statements/tf1-ch-c-conformance-statement-ieee-11073-10207-2017-Cor1-2025.adoc → asciidoc/conformance/conformance-statements/conformance-statement-ieee-11073-10207-2017.adoc

@@ -6,7 +6,7 @@
 [%autowidth]
 [cols="1"]
 |===
-| *{supplement_note}*: This section is provided as a placeholder for the <<acronym_ics>> table specification that will be added in a subsequent SDPi supplement version.
+| *{standard_note}*: This section is provided as a placeholder for the <<acronym_ics>> table specification that will be added in a subsequent SDPi standard version.
 The tables will have an additional SDPi column added to the right side that indicates *if* and TBD *where* the requirement is satisfied.
 Requirement Definition (this table's rows) will be referenced where they are satisfied; however, these tables may also include forward references, at least in general, to what capabilities / requirements satisfy the referenced standard requirement.
 
@@ -40,7 +40,7 @@ ADD IEEE:  *Remote Control ICS table here*
 [%autowidth]
 [cols="1"]
 |===
-a| *{supplement_note}*: Context processing pertains to effective utilization of context information like workflow (e.g., orders) info, patient demographics and locations.
+a| *{standard_note}*: Context processing pertains to effective utilization of context information like workflow (e.g., orders) info, patient demographics and locations.
 A future version of SDPi will describe how to cope with contexts, with device coupling mechanisms described informally in TF-1 and formally in TF-2 (possibly as a transaction).
 |===
 

asciidoc/conformance/conformance.adoc

@@ -0,0 +1,78 @@
+
+[#clause_conformance,sdpi_offset=clear]
+= Conformance
+
+[%noheader]
+[cols="1"]
+|===
+a| *{standard_note}*: A new Conformance clause has been proposed for this Gemini SDPi standard, which will provide a new home for the previous revision  1:B.2 Referenced Standards Conformance, and is a companion section to the summary listing that is provided in that refactored section now located in the References section.
+Note that additional content, such as Appendix 3:Z Implementation conformity statements may also be moved here.
+NOTE: There may be some technical issues with consolidating all the conformance content in this section of the document.
+
+
+#REVIEWER QUESTIONS#:
+
+. Comment on the value, or not, of moving all conformance content to this clause, and whether any additional sections should be added earlier in the document regarding identification (listing) of those normative references that will be included in this clause.
+For example, in an updated and simplified version of the
+
+|===
+
+
+// Overview of conformance to this SDPi standard
+[sdpi_offset=1]
+== Overview
+
+[%noheader]
+[%autowidth]
+[cols="1"]
+|===
+a| *{standard_note}*:  This section will provide a general introduction and overview of how implementations can claim and establish conformance with both the profile elements of this standard (e.g., SDPi-P SOMDS Provider with the Managed Discovery Option), as well as the normatively referenced standards that underpin this technical framework (e.g., ISO/IEEE 11073-10207).
+|===
+
+include::ics-overview.adoc[]
+
+//
+[sdpi_offset=1]
+== Normative references implementation conformity statements
+
+// Section provides detail for normative standards requirements traceability
+[sdpi_offset=1]
+=== Mapping Foundational Standard Requirements to SDPi Constructs
+
+[%noheader]
+[%autowidth]
+[cols="1"]
+|===
+a| *{standard_note}*:  This section intentionally left blank for the current version, but is a placeholder for content that will be added in the future.
+|===
+
+////
+#TODO:  Add RI overview & spec / styleguide for how requirements from ICS tables and similar are mapped to where they are satisfied + a link / reference to the general discussion in TF-1 Appendix A and the Referenced Standards model for RI#
+////
+
+// Section details ICS for Referenced Standards
+=== Overview of Normative Referenced Standards Conformity Statements
+
+[%noheader]
+[%autowidth]
+[cols="1"]
+|===
+a| *{standard_note}*:  This section intentionally left blank for the current version, but is a placeholder for content that will be added in the future.
+|===
+
+////
+#TODO:  Provide a general overview of the topic, including some standards that provide Conformity statements, ICS tables, etc., and those that are moot on the topic - and how all of this is handled in this appendix and TF specification#
+////
+
+// IEEE 11073-10207:2017 ICS
+
+include::conformance-statements/conformance-statement-ieee-11073-10207-2017.adoc[]
+
+// ISO/IEEE 11073-10700:2022 ICS
+
+include::conformance-statements/conformance-statement-ieee-11073-10700-2022.adoc[]
+
+// ISO/IEEE 11073-10701:2022 ICS
+
+include::conformance-statements/conformance-statement-ieee-11073-10701-2022.adoc[]
+

asciidoc/volume3/tf3-ch-z-ics.adoc → asciidoc/conformance/ics-overview.adoc

@@ -1,10 +1,10 @@
-[appendix#vol3_appendix_d_ics,sdpi_offset=Z]
-== Implementation conformity statements
+[#clause_sdpi_ics]
+== SDPi implementation conformity statements
 
 === General format
 
 Implementation conformity statements take the form of tables. Templates for these _ICS tables_
-are given in <<vol4_ics_tables>>. The tables are completed and provided as an overall conformity
+are given in <<vol3_ics_tables>>. The tables are completed and provided as an overall conformity
 statement document. 
 
 Generally an implementation conformity table contains the following information:
@@ -28,166 +28,166 @@ The *Support* column may be a simple entry, such as one of the following, or a d
 * *no*: to requirement is not met,
 * *n/a*: the requirement is not applicable, with a rationale provided in the *Comment*.
 
-[#vol4_ics_tables]
+[#vol3_ics_tables]
 === Tables
 
 ==== SOMDS Participant
 
-RefActor:somds_participant[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_participant>>.
+RefActor:somds_participant[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_participant>>.
 
-[#vol4_ics_actor_somds_participant]
+[#vol3_ics_actor_somds_participant]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_participant>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_participant]
 
 ==== SOMDS Provider
 
-RefActor:somds_provider[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_provider>>.
+RefActor:somds_provider[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_provider>>.
 
-[#vol4_ics_actor_somds_provider]
+[#vol3_ics_actor_somds_provider]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_provider>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_provider]
 
 ==== SOMDS Consumer
 
-RefActor:somds_consumer[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_consumer>>.
+RefActor:somds_consumer[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_consumer>>.
 
-[#vol4_ics_actor_somds_consumer]
+[#vol3_ics_actor_somds_consumer]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_consumer>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_consumer]
 
 ==== SOMDS Connector
 
-RefActor:somds_connector[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_connector>>.
+RefActor:somds_connector[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_connector>>.
 
-[#vol4_ics_actor_somds_connector]
+[#vol3_ics_actor_somds_connector]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_connector>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_connector]
 
 ==== SOMDS FHIR Gateway
 
-RefActor:somds_fhir_gateway[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_fhir_gateway>>.
+RefActor:somds_fhir_gateway[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_fhir_gateway>>.
 
-[#vol4_ics_actor_somds_fhir_gateway]
+[#vol3_ics_actor_somds_fhir_gateway]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_fhir_gateway>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_fhir_gateway]
 
 ==== SOMDS V2 Gateway
 
-RefActor:somds_v2_gateway[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_v2_gateway>>.
+RefActor:somds_v2_gateway[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_v2_gateway>>.
 
-[#vol4_ics_actor_somds_v2_gateway]
+[#vol3_ics_actor_somds_v2_gateway]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_v2_gateway>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_v2_gateway]
 
 ==== SOMDS Sensor Gateway
 
-RefActor:somds_sensor_gateway[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_sensor_gateway>>.
+RefActor:somds_sensor_gateway[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_sensor_gateway>>.
 
-[#vol4_ics_actor_somds_sensor_gateway]
+[#vol3_ics_actor_somds_sensor_gateway]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_sensor_gateway>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_sensor_gateway]
 
 ==== SOMDS Smart App
 
-RefActor:somds_smart_app[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_smart_app>>.
+RefActor:somds_smart_app[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_smart_app>>.
 
-[#vol4_ics_actor_somds_smart_app]
+[#vol3_ics_actor_somds_smart_app]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_somds_smart_app_platform>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_smart_app]
 
 ==== BICEPS Content Creator
 
-RefActor:biceps_content_creator[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_biceps_content_creator>>.
+RefActor:biceps_content_creator[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_biceps_content_creator>>.
 
-[#vol4_ics_actor_biceps_content_creator]
+[#vol3_ics_actor_biceps_content_creator]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_biceps_content_creator>>s.
 sdpi_ics_table::[sdpi_req_actor=biceps_content_creator]
 
 ==== BICEPS Content Consumer
 
-RefActor:biceps_content_consumer[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_biceps_content_consumer>>.
+RefActor:biceps_content_consumer[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_biceps_content_consumer>>.
 
-[#vol4_ics_actor_biceps_content_consumer]
+[#vol3_ics_actor_biceps_content_consumer]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_biceps_content_consumer>>s.
 sdpi_ics_table::[sdpi_req_actor=biceps_content_consumer]
 
 ==== Discovery Proxy
 
-RefActor:discovery_proxy[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_discovery_proxy>>.
+RefActor:discovery_proxy[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_discovery_proxy>>.
 
-[#vol4_ics_actor_discovery_proxy]
+[#vol3_ics_actor_discovery_proxy]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_p_discovery_proxy>>s.
 sdpi_ics_table::[sdpi_req_actor=discovery_proxy]
 
 ==== SOMDS Medical Data Provider
 
-RefActor:somds_medical_data_provider[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_medical_data_provider>>.
+RefActor:somds_medical_data_provider[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_medical_data_provider>>.
 
-[#vol4_ics_actor_somds_medical_data_provider]
+[#vol3_ics_actor_somds_medical_data_provider]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_r_somds_medical_data_provider>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_medical_data_provider]
 
 ==== SOMDS Medical Data Consumer
 
-RefActor:somds_medical_data_consumer[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_medical_data_consumer>>.
+RefActor:somds_medical_data_consumer[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_medical_data_consumer>>.
 
-[#vol4_ics_actor_somds_medical_data_consumer]
+[#vol3_ics_actor_somds_medical_data_consumer]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_r_somds_medical_data_consumer>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_medical_data_consumer]
 
 ==== SOMDS Dec Gateway
 
-RefActor:somds_dec_gateway[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_dec_gateway>>.
+RefActor:somds_dec_gateway[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_dec_gateway>>.
 
-[#vol4_ics_actor_somds_dec_gateway]
+[#vol3_ics_actor_somds_dec_gateway]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_r_somds_dec_gateway>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_dec_gateway]
 
 ==== FHIR Medical Data Gateway
 
-RefActor:somds_fhir_medical_data_gateway[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_fhir_medical_data_gateway>>.
+RefActor:somds_fhir_medical_data_gateway[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_fhir_medical_data_gateway>>.
 
-[#vol4_ics_actor_somds_fhir_medical_data_gateway]
+[#vol3_ics_actor_somds_fhir_medical_data_gateway]
 .Implementation conformity statements that apply to all <<vol1_spec_sdpi_r_actor_somds_fhir_medical_data_gateway>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_fhir_medical_data_gateway]
 
 ==== SOMDS Medical Alert Provider
 
-RefActor:somds_medical_alert_provider[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_medical_alert_provider>>.
+RefActor:somds_medical_alert_provider[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_medical_alert_provider>>.
 
-[#vol4_ics_actor_somds_medical_alert_provider]
+[#vol3_ics_actor_somds_medical_alert_provider]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_a_somds_medical_alert_provider>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_medical_alert_provider]
 
 ==== SOMDS Medical Alert Consumer
 
-RefActor:somds_medical_alert_consumer[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_medical_alert_consumer>>.
+RefActor:somds_medical_alert_consumer[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_medical_alert_consumer>>.
 
-[#vol4_ics_actor_somds_medical_alert_consumer]
+[#vol3_ics_actor_somds_medical_alert_consumer]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_a_somds_medical_alert_consumer>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_medical_alert_consumer]
 
 ==== SOMDS ACM Gateway
 
-RefActor:somds_acm_gateway[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_acm_gateway>>.
+RefActor:somds_acm_gateway[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_acm_gateway>>.
 
-[#vol4_ics_actor_somds_acm_gateway]
+[#vol3_ics_actor_somds_acm_gateway]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_a_somds_acm_gateway>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_acm_gateway]
 
 ==== SOMDS Medical Control Provider
 
-RefActor:somds_medical_control_provider[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_medical_control_provider>>.
+RefActor:somds_medical_control_provider[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_medical_control_provider>>.
 
-[#vol4_ics_actor_somds_medical_control_provider]
+[#vol3_ics_actor_somds_medical_control_provider]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_xc_somds_medical_control_provider>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_medical_control_provider]
 
 ==== SOMDS Medical Control Consumer
 
-RefActor:somds_medical_control_consumer[] actors indicate conformatity with this profile by completing <<vol4_ics_actor_somds_medical_control_consumer>>.
+RefActor:somds_medical_control_consumer[] actors indicate conformatity with this profile by completing <<vol3_ics_actor_somds_medical_control_consumer>>.
 
-[#vol4_ics_actor_somds_medical_control_consumer]
+[#vol3_ics_actor_somds_medical_control_consumer]
 .Implementation conformity statements that apply to all <<vol1_clause_sdpi_xc_somds_medical_control_consumer>>s.
 sdpi_ics_table::[sdpi_req_actor=somds_medical_control_consumer]