From 30aefb8fde979fc04bd596710686075255a1faf6 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Fri, 24 Jun 2022 11:43:34 +0200
Subject: [PATCH] Load R5 extensions when validating

---
 .../main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java    | 4 ++++
 .../org/hl7/fhir/utilities/validation/ValidationMessage.java  | 3 ++-
 org.hl7.fhir.utilities/src/main/resources/Messages.properties | 2 +-
 .../hl7/fhir/validation/cli/services/ComparisonService.java   | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
index ee62af742..3b4a5b6e5 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
@@ -78,6 +78,10 @@ public class SimpleHTTPClient {
           throw new IOException("Invalid HTTP response "+code+" from "+source+" ("+message+") (content in "+filename+")");
         }
       }      
+    }
+
+    public String getMessage() {
+      return message;
     }    
   }
 
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java
index f191bb0d0..57f863bda 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java
@@ -83,7 +83,8 @@ public class ValidationMessage implements Comparator<ValidationMessage>, Compara
     Ontology, 
     ProfileComparer, 
     TerminologyEngine,
-    QuestionnaireResponseValidator
+    QuestionnaireResponseValidator, 
+    IPAValidator
   }
 
   public enum IssueSeverity {
diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties
index e7d666f10..93ddecf8a 100644
--- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties
@@ -361,7 +361,7 @@ element__null_ = element = null: {0}
 getSliceList_should_only_be_called_when_the_element_has_slicing = getSliceList should only be called when the element has slicing
 Unable_to_resolve_name_reference__at_path_ = Unable to resolve name reference {0} at path {1}
 Details_for__matching_against_Profile_ = Details for {0} matching against Profile {1}
-Does_not_match_slice_ = Does not match slice ''{0}''
+Does_not_match_slice_ = Does not match slice ''{0}'' (discriminator: {1})
 Profile__does_not_match_for__because_of_the_following_profile_issues__ = Profile {0} does not match for {1} because of the following profile issues: {2}
 This_element_does_not_match_any_known_slice_ = This element does not match any known slice{0}
 defined_in_the_profile = defined in the profile 
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ComparisonService.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ComparisonService.java
index f8c763360..795739d76 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ComparisonService.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ComparisonService.java
@@ -56,6 +56,7 @@ public class ComparisonService {
 //    File htmlFile = cr.render(left, right);
 //    Desktop.getDesktop().browse(htmlFile.toURI());
 //    System.out.println("Done");
+//    cr.getTemplates().put("CapabilityStatement", new String(context.getBinaries().get("template-comparison-CapabilityStatement.html")));
   }
 
   public static void compareStructureDefinitions(String dest, ValidationEngine validator, String left, String right, StructureDefinition resLeft, StructureDefinition resRight) throws IOException, FHIRException, EOperationOutcome {
@@ -70,6 +71,7 @@ public class ComparisonService {
     cr.getTemplates().put("ValueSet", new String(validator.getContext().getBinaries().get("template-comparison-ValueSet.html")));
     cr.getTemplates().put("Profile", new String(validator.getContext().getBinaries().get("template-comparison-Profile.html")));
     cr.getTemplates().put("Index", new String(validator.getContext().getBinaries().get("template-comparison-index.html")));
+    cr.getTemplates().put("CapabilityStatement", new String(validator.getContext().getBinaries().get("template-comparison-CapabilityStatement.html")));
     File htmlFile = cr.render(left, right);
     Desktop.getDesktop().browse(htmlFile.toURI());
     System.out.println("Done");