From df9a05b56a36376793a7d314080b0d91de2a970e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 21 Jan 2020 12:22:53 +1100 Subject: [PATCH] fix error message --- .../main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java | 2 +- .../src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index dd2a8de0e..c620f6ac2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -2424,7 +2424,7 @@ public class ProfileUtilities extends TranslatingUtilities { if (messages == null) { throw new FHIRException("Error at "+purl+"#"+derived.getPath()+": The target profile "+url+" is not valid constraint on the base ("+td.getTargetProfile()+")"); } else { - messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.BUSINESSRULE, pn+"."+derived.getPath(), "The target profile "+url+" is not a valid constraint on the base ("+td.getTargetProfile()+")", IssueSeverity.ERROR)); + messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.BUSINESSRULE, derived.getPath(), "The target profile "+u.getValue()+" is not a valid constraint on the base ("+td.getTargetProfile()+")", IssueSeverity.ERROR)); } } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java index 8e0976281..c044f589c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java @@ -209,7 +209,7 @@ public class TerminologyCache { return "11073"; if (system.equals("http://dicom.nema.org/resources/ontology/DCM")) return "dicom"; - return system.replace("/", "_").replace(":", "_"); + return system.replace("/", "_").replace(":", "_").replace("?", "X").replace("#", "X"); } public NamedCache getNamedCache(CacheToken cacheToken) {