honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1790 - Fix versionFromCanonical returns system instead and systemFromCanonical returns version

This commit is contained in:
Grahame Grieve 2024-10-30 21:05:03 +10:30
parent 1100fe2855
commit e8973a90d8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java
View File

@ -173,7 +173,7 @@ public class FHIRPathEngine {
private StringBuilder log = new StringBuilder(); private StringBuilder log = new StringBuilder();
private Set<String> primitiveTypes = new HashSet<String>(); private Set<String> primitiveTypes = new HashSet<String>();
private Map<String, StructureDefinition> allTypes = new HashMap<String, StructureDefinition>(); private Map<String, StructureDefinition> allTypes = new HashMap<String, StructureDefinition>();
private boolean legacyMode; // some R2 and R3 constraints assume that != is valid for emptty sets, so when running for R2/R3, this is set ot true private boolean legacyMode; // some R2 and R3 constraints assume that != is valid for empty sets, so when running for R2/R3, this is set ot true
private ValidationOptions terminologyServiceOptions = new ValidationOptions(FhirPublication.R5); private ValidationOptions terminologyServiceOptions = new ValidationOptions(FhirPublication.R5);
private ProfileUtilities profileUtilities; private ProfileUtilities profileUtilities;
private String location; // for error messages private String location; // for error messages

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -2236,7 +2236,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
return b.toString(); return b.toString();
} }
protected String versionFromCanonical(String system) { protected String systemFromCanonical(String system) {
if (system == null) { if (system == null) {
return null; return null;
} else if (system.contains("|")) { } else if (system.contains("|")) {
@ -2246,7 +2246,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
} }
} }
protected String systemFromCanonical(String system) { protected String versionFromCanonical(String system) {
if (system == null) { if (system == null) {
return null; return null;
} else if (system.contains("|")) { } else if (system.contains("|")) {