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

fix error with IG constraint

This commit is contained in:
Grahame Grieve 2022-09-15 09:00:51 +02:00
parent 37982f2af3
commit 43420db756
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageHacker.java
View File

@ -71,8 +71,8 @@ public class PackageHacker {
}
private void change(JsonObject npm) throws FileNotFoundException, IOException {
fixVersions(npm);
// npm.remove("notForPublication");
// fixVersions(npm);
npm.remove("notForPublication");
// npm.addProperty("url", "http://hl7.org/fhir/us/carin-rtpbc/STU1");
// npm.remove("name");
// npm.addProperty("name", "hl7.fhir.uv.smart-app-launch");
@ -80,10 +80,10 @@ public class PackageHacker {
// npm.addProperty("canonical", "http://hl7.org/fhir/us/davinci-drug-formulary");
//// npm.remove("description");
//// npm.addProperty("description", "Group Wrapper that includes all the R4 packages");
npm.remove("url");
npm.addProperty("url", "http://hl7.org/fhir/R4B");
npm.remove("homepage");
npm.addProperty("homepage", "http://hl7.org/fhir/R4B");
// npm.remove("url");
// npm.addProperty("url", "http://hl7.org/fhir/R4B");
// npm.remove("homepage");
// npm.addProperty("homepage", "http://hl7.org/fhir/R4B");
// npm.remove("dependencies");
// JsonObject dep = new JsonObject();
// npm.add("dependencies", dep);

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/FHIRPathExpressionFixer.java
View File

@ -19,7 +19,9 @@ public class FHIRPathExpressionFixer {
if ("txt-2".equals(key)) {
return "htmlChecks2()";
}
if ("generated='generated' implies source.empty()".equals(expr)) {
return "generation='generated' implies source.empty()";
}
// fixes to string functions in FHIRPath
// ref-1
if (expr.equals("reference.startsWith('#').not() or (reference.substring(1).trace('url') in %rootResource.contained.id.trace('ids')) or (reference='#' and %rootResource!=%resource)")) { // R5