Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2023 08 gg byte provider #733

Merged
merged 17 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
* Loader: clarification of dependency message
* Loader: don't want for loading wrong version package more than once
* Loader: Don't warn for loading a wrong version package more than once
* Loader: Do not supercede R4 terminology when loading R5 IGs
* Snapshot Generator: Support for x-version extensions when generating snapshots
* Snapshot Generator: Migrate type support when generating differentials
* Validator: Fix problem with evaluating extension contexts
* Validator: Fix up support for inactive codes
* Validator: Fix error message syntax
* Validator: Fix issue with collection status of resolve() being wrong
* Validator: Improved paths in profile error messages
* Validator: Fix problem with extension slicing being missed sometimes.
* Validator: Fix problem with code validation caching ignoring whitespace
* Validator: Produce useful error message when whitespace is wrong in display name
* Renderer: Render inactive property in expansions
* Renderer: Resolve URL for x-version extensions
* QA: better information about US snomed edition
Original file line number Diff line number Diff line change
Expand Up @@ -2906,7 +2906,7 @@ else if (vsCache == null) {
}

if (!VersionUtilities.isR5Plus(context.getVersion())) {
System.out.print("Load R5 Specials");
System.out.println("Load R5 Specials");
R5ExtensionsLoader r5e = new R5ExtensionsLoader(pcm, context);
r5e.load();
r5e.loadR5SpecialTypes(SpecialTypeHandler.specialTypes(context.getVersion()));
Expand Down Expand Up @@ -3993,7 +3993,6 @@ private void loadIGPackage(String name, String canonical, String packageId, Stri
loadFromPackage(name, canonical, pi, webref, igm, loadDeps);
}


private boolean isValidIGToken(String tail) {
if (tail == null || tail.length() == 0)
return false;
Expand All @@ -4002,7 +4001,6 @@ private boolean isValidIGToken(String tail) {
result = result && (Utilities.isAlphabetic(tail.charAt(i)) || Utilities.isDigit(tail.charAt(i)) || (tail.charAt(i) == '_'));
}
return result;

}

private String idForDep(ImplementationGuideDependsOnComponent dep) {
Expand Down Expand Up @@ -7428,6 +7426,17 @@ private Element convertToElement(FetchedResource r, Resource res) throws Excepti
parseVersion = str(r.getConfig(), "version", version);
}
}
XhtmlNode xhtml = null;
if (res instanceof DomainResource) {
xhtml = ((DomainResource) res).getText().getDiv();
if (xhtml != null) {
if (xhtml.isEmpty()) {
xhtml = null;
} else {
((DomainResource) res).getText().setDiv(new XhtmlParser().parseFragment("<div xmlns=\"http://www.w3.org/1999/xhtml\">Placeholder</div>"));
}
}
}
ByteArrayOutputStream bs = new ByteArrayOutputStream();
if (VersionUtilities.isR3Ver(parseVersion)) {
org.hl7.fhir.dstu3.formats.JsonParser jp = new org.hl7.fhir.dstu3.formats.JsonParser();
Expand All @@ -7449,7 +7458,11 @@ private Element convertToElement(FetchedResource r, Resource res) throws Excepti
jp.compose(bs, res);
}
ByteArrayInputStream bi = new ByteArrayInputStream(bs.toByteArray());
return new org.hl7.fhir.r5.elementmodel.JsonParser(context).parseSingle(bi);
Element e = new org.hl7.fhir.r5.elementmodel.JsonParser(context).parseSingle(bi);
if (xhtml != null) {
e.getNamedChild("text").getNamedChild("div").setXhtml(xhtml);
}
return e;
}

private Resource convertFromElement(Element res) throws IOException, org.hl7.fhir.exceptions.FHIRException, FHIRFormatError, DefinitionException {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<version>1.3.29-SNAPSHOT</version> <!-- See the note above -->

<properties>
<core_version>6.0.25</core_version>
<core_version>6.0.26-SNAPSHOT</core_version>
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
<apache_poi_version>5.2.1</apache_poi_version>
<okhttp.version>4.10.0</okhttp.version>
Expand Down
Loading