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.

Sign up for GitHub

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

Moved generation of file to _after_ the other ndjson files are genera… #1491

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Moved generation of file to _after_ the other ndjson files are genera… #1491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 27 additions & 28 deletions src/main/java/org/mitre/synthea/export/Exporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,34 +503,6 @@ public static void runPostCompletionExports(Generator generator) {
*/
public static void runPostCompletionExports(Generator generator, ExporterRuntimeOptions options) {

if (Config.getAsBoolean("exporter.fhir.bulk_data")) {
IParser parser = FhirR4.getContext().newJsonParser();
parser.setPrettyPrint(false);
Parameters parameters = new Parameters()
.addParameter("inputFormat","application/fhir+ndjson");
File outDirectory = getOutputFolder("fhir", null);

File[] files = outDirectory.listFiles(pathname -> pathname.getName().endsWith("ndjson"));

String configHostname = Config.get("exporter.fhir.bulk_data.parameter_hostname");
String hostname = Strings.isNullOrEmpty(configHostname)
? "http://localhost:8080/" : configHostname;

for (File file : files) {
parameters.addParameter(
new Parameters.ParametersParameterComponent().setName("input")
.addPart(new Parameters.ParametersParameterComponent()
.setName("type")
.setValue(new StringType(file.getName().split("\\.")[0])))
.addPart(new Parameters.ParametersParameterComponent()
.setName("url")
.setValue(new StringType(hostname + file.getName()))));
}
overwriteFile(outDirectory.toPath().resolve("parameters.json"),
parser.encodeResourceToString(parameters));
}


if (options.deferExports) {
ExporterRuntimeOptions nonDeferredOptions = new ExporterRuntimeOptions(options);
nonDeferredOptions.deferExports = false;
Expand Down Expand Up @@ -619,6 +591,33 @@ public static void runPostCompletionExports(Generator generator, ExporterRuntime
TransitionMetrics.exportMetrics();
}

if (Config.getAsBoolean("exporter.fhir.bulk_data")) {
IParser parser = FhirR4.getContext().newJsonParser();
parser.setPrettyPrint(false);
Parameters parameters = new Parameters()
.addParameter("inputFormat","application/fhir+ndjson");
File outDirectory = getOutputFolder("fhir", null);

File[] files = outDirectory.listFiles(pathname -> pathname.getName().endsWith("ndjson"));

String configHostname = Config.get("exporter.fhir.bulk_data.parameter_hostname");
String hostname = Strings.isNullOrEmpty(configHostname)
? "http://localhost:8000/" : configHostname;

for (File file : files) {
parameters.addParameter(
new Parameters.ParametersParameterComponent().setName("input")
.addPart(new Parameters.ParametersParameterComponent()
.setName("type")
.setValue(new StringType(file.getName().split("\\.")[0])))
.addPart(new Parameters.ParametersParameterComponent()
.setName("url")
.setValue(new StringType(hostname + file.getName()))));
}
overwriteFile(outDirectory.toPath().resolve("parameters.json"),
parser.encodeResourceToString(parameters));
}

if (postCompletionExporters != null && !postCompletionExporters.isEmpty()) {
for (PostCompletionExporter postCompletionExporter : postCompletionExporters) {
postCompletionExporter.export(generator, options);
Expand Down
Loading