From c01ef23780088e62c846d964a8e1d7976f89aa32 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 23 Jan 2025 14:27:34 -0500 Subject: [PATCH] Remove unneeded fields from db metadata --- .../hl7/fhir/igtools/publisher/Publisher.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java index fee9022c..66002b2a 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java @@ -10904,9 +10904,19 @@ private void generateDataFile(DBBuilder db) throws IOException, FHIRException, S data.add("toolingVersion", Constants.VERSION); data.add("toolingRevision", ToolsVersion.TOOLS_VERSION_STR); data.add("toolingVersionFull", Constants.VERSION+" ("+ToolsVersion.TOOLS_VERSION_STR+")"); + + data.add("genDate", genTime()); + data.add("genDay", genDate()); + if (db != null) { + for (JsonProperty p : data.getProperties()) { + db.metadata(p.getName(), p.getValue().asString()); + } + db.metadata("gitstatus", getGitStatus()); + } + data.add("totalFiles", fileList.size()); data.add("processedFiles", changeList.size()); - + if (repoSource != null) { data.add("repoSource", gh()); } else { @@ -10915,13 +10925,7 @@ private void generateDataFile(DBBuilder db) throws IOException, FHIRException, S data.add("repoSource", git); } } - data.add("genDate", genTime()); - data.add("genDay", genDate()); - if (db != null) { - for (JsonProperty p : data.getProperties()) { - db.metadata(p.getName(), p.getValue().asString()); - } - } + JsonArray rt = data.forceArray("resourceTypes"); List rtl = context.getResourceNames(); for (String s : rtl) { @@ -10947,9 +10951,7 @@ private void generateDataFile(DBBuilder db) throws IOException, FHIRException, S ig.add("experimental", publishedIg.getExperimental()); ig.add("publisher", publishedIg.getPublisher()); addTranslationsToJson(ig, "publisher", publishedIg.getPublisherElement(), false); - if (db != null) { - db.metadata("gitstatus", getGitStatus()); - } + if (previousVersionComparator != null && previousVersionComparator.hasLast() && !targetUrl().startsWith("file:")) { JsonObject diff = new JsonObject(); data.add("diff", diff);