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 rendering of special compiler types

This commit is contained in:
Grahame Grieve 2019-08-01 11:38:09 +10:00
parent 564d9262c6
commit bf9ead2c9e
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -2217,7 +2217,6 @@ public class ProfileUtilities extends TranslatingUtilities {
return null;
}
private static final int AGG_NONE = 0;
private static final int AGG_IND = 1;
private static final int AGG_GR = 2;
@ -2311,10 +2310,15 @@ public class ProfileUtilities extends TranslatingUtilities {
}
} else
c.addPiece(checkForNoChange(t, gen.new Piece((t.getProfile().get(0).getValue().startsWith(corePath)? corePath: "")+ref, t.getCode(), null)));
} else if (pkp != null && pkp.hasLinkFor(t.getCode())) {
c.addPiece(checkForNoChange(t, gen.new Piece(pkp.getLinkFor(corePath, t.getCode()), t.getCode(), null)));
} else
c.addPiece(checkForNoChange(t, gen.new Piece(null, t.getCode(), null)));
} else {
String tc = t.getCode();
if (Utilities.noString(tc) && t.getCodeElement().hasExtension(ToolingExtensions.EXT_JSON_TYPE))
tc = "string";
if (pkp != null && pkp.hasLinkFor(tc)) {
c.addPiece(checkForNoChange(t, gen.new Piece(pkp.getLinkFor(corePath, tc), tc, null)));
} else
c.addPiece(checkForNoChange(t, gen.new Piece(null, tc, null)));
}
}
return c;
}

20
org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
View File

@ -830,6 +830,26 @@
"errorCount": 1
}
},
"value-slicing-ok-1.xml": {
"errorCount": 0,
"profiles": [
"profile-slicing-profile-1.xml", "profile-slicing-profile-2.xml", "profile-slicing-profile-3.xml"
],
"profile": {
"source": "value-slicing-profile-open.xml",
"errorCount": 0
}
},
"value-slicing-bad-1.xml": {
"errorCount": 0,
"profiles": [
"profile-slicing-profile-1.xml", "profile-slicing-profile-2.xml", "profile-slicing-profile-3.xml"
],
"profile": {
"source": "value-slicing-profile-open.xml",
"errorCount": 1
}
},
"bundle-local-refs.xml" : {
"errorCount": 0,
"warningCount": 0