Merge pull request #1039 from HL7/SupportEHRPackage

Add support for hl7.ehr. packages
HL7 · Feb 10, 2025 · 8116df8 · 8116df8
2 parents 8fdf5c6 + 421aa92
commit 8116df8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/....fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/DependencyRenderer.java b/....fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/DependencyRenderer.java
@@ -605,8 +605,8 @@ private Row addBaseRow(HierarchicalTableGenerator gen, TableModel model, Impleme
     String comment = null;
     if (!id.equals(npmName)) {
       comment = "Expected Package Id is "+npmName;
-    } else if (id.startsWith("hl7") && !id.startsWith("hl7.cda.") && !id.startsWith("hl7.fhir.") && !id.startsWith("hl7.v2.")) {
-      comment = "HL7 Packages must have an id that starts with hl7.cda., hl7.fhir., or hl7.v2.";
+    } else if (id.startsWith("hl7") && !id.startsWith("hl7.cda.") && !id.startsWith("hl7.fhir.") && !id.startsWith("hl7.v2.") && !id.startsWith("hl7.ehr.")) {
+      comment = "HL7 Packages must have an id that starts with hl7.cda., hl7.fhir., hl7.v2., or hl7.ehr.";
     }
     Row row = addRow(gen, model.getRows(), id,  ig.present(), ver, null, null, false, fver, false, canonical, web, comment, null, QA, hasDesc, true);
     if (QA && comment != null) {

diff --git a/...ir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/WebSiteLayoutRulesProviders.java b/...ir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/WebSiteLayoutRulesProviders.java
@@ -135,7 +135,7 @@ public boolean checkNpmId(List<ValidationMessage> res) {
       if ("eu".equals(parts[1])) {
         ok = check(res, Utilities.existsInList(parts[2], "fhir"), "Package Id '"+id+"' is not valid: must start with hl7.eu.fhir.[code]") && ok;         
       } else {
-        ok = check(res, Utilities.existsInList(parts[1], "fhir", "xprod", "cda"), "Package Id '"+id+"' is not valid: must start with hl7.fhir.[realm].[code], hl7.cda.[realm].[code] or hl7.xprod.[realm].[code]") && ok; 
+        ok = check(res, Utilities.existsInList(parts[1], "fhir", "xprod", "cda", "ehr"), "Package Id '"+id+"' is not valid: must start with hl7.fhir.[realm].[code], hl7.cda.[realm].[code], hl7.ehr.[realm].[code] or hl7.xprod.[realm].[code]") && ok; 
       }
       return ok;
     }