From 670987404ec02f1dd7639d3d1081fa1f68ebee56 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 2 Jul 2024 06:44:56 +0930 Subject: [PATCH] Auto stash before merge of "master" and "origin/master" --- .../fhir/igtools/publisher/HTMLInspector.java | 2 +- .../hl7/fhir/igtools/publisher/Publisher.java | 12 ++++--- .../igtools/publisher/SpecMapManager.java | 2 +- .../igtools/renderers/DependencyRenderer.java | 2 +- .../StructureDefinitionRenderer.java | 14 ++++---- pom.xml | 2 +- test-statistics.csv | 1 + test-statistics.json | 32 +++++++++++++++++++ 8 files changed, 52 insertions(+), 15 deletions(-) diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/HTMLInspector.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/HTMLInspector.java index 57bebcaa..370827b2 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/HTMLInspector.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/HTMLInspector.java @@ -84,7 +84,7 @@ public boolean hasDuplicates() { } public String listDuplicates() { - return CommaSeparatedStringBuilder.join(",", duplicates); + return CommaSeparatedStringBuilder.join(",", Utilities.sorted(duplicates)); } } 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 0d13ed3d..446be9b5 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 @@ -11867,7 +11867,11 @@ private void generateOutputsStructureDefinition(FetchedFile f, FetchedResource r if (igpkp.wantGen(r, "summary")) { long start = System.currentTimeMillis(); - fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-summary", sdr.summary(), f.getOutputNames(), r, vars, null, start, "summary", "StructureDefinition"); + fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-summary", sdr.summary(false), f.getOutputNames(), r, vars, null, start, "summary", "StructureDefinition"); + } + if (igpkp.wantGen(r, "summary-all")) { + long start = System.currentTimeMillis(); + fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-summary-all", sdr.summary(true), f.getOutputNames(), r, vars, null, start, "summary", "StructureDefinition"); } if (igpkp.wantGen(r, "summary-table")) { long start = System.currentTimeMillis(); @@ -11948,7 +11952,7 @@ private void generateOutputsStructureDefinition(FetchedFile f, FetchedResource r } if (igpkp.wantGen(r, "expansion")) { long start = System.currentTimeMillis(); - fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-expansion", sdr.expansion(igpkp.getDefinitionsName(r), otherFilesRun), f.getOutputNames(), r, vars, null, start, "expansion", "StructureDefinition"); + fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-expansion", sdr.expansion(igpkp.getDefinitionsName(r), otherFilesRun, "x"), f.getOutputNames(), r, vars, null, start, "expansion", "StructureDefinition"); } if (igpkp.wantGen(r, "grid")) { long start = System.currentTimeMillis(); @@ -12054,11 +12058,11 @@ private void generateOutputsStructureDefinition(FetchedFile f, FetchedResource r fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-typename", sdr.typeName(), f.getOutputNames(), r, vars, null, start, "-typename", "StructureDefinition"); if (sd.getDerivation() == TypeDerivationRule.CONSTRAINT && igpkp.wantGen(r, "span")) { start = System.currentTimeMillis(); - fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-span", sdr.span(true, igpkp.getCanonical(), otherFilesRun), f.getOutputNames(), r, vars, null, start, "span", "StructureDefinition"); + fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-span", sdr.span(true, igpkp.getCanonical(), otherFilesRun, "sp"), f.getOutputNames(), r, vars, null, start, "span", "StructureDefinition"); } if (sd.getDerivation() == TypeDerivationRule.CONSTRAINT && igpkp.wantGen(r, "spanall")) { start = System.currentTimeMillis(); - fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-spanall", sdr.span(true, igpkp.getCanonical(), otherFilesRun), f.getOutputNames(), r, vars, null, start, "spanall", "StructureDefinition"); + fragment("StructureDefinition-"+prefixForContainer+sd.getId()+"-spanall", sdr.span(true, igpkp.getCanonical(), otherFilesRun, "spall"), f.getOutputNames(), r, vars, null, start, "spanall", "StructureDefinition"); } if (igpkp.wantGen(r, "example-list")) { diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SpecMapManager.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SpecMapManager.java index 96e1e053..bb54a1f4 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SpecMapManager.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SpecMapManager.java @@ -176,7 +176,7 @@ public String getPath(String url, String def, String rt, String id) throws FHIRE if (url == null) { return null; } - if (paths.has(url)) { + if (paths.has(url) && !("http://hl7.org/fhir/R5".equals(base) && url.startsWith("http://terminology.hl7.org"))) { String p = strOpt(paths, url); if (!Utilities.isAbsoluteUrl(p) ) { p = Utilities.pathURL(base2 == null ? base : base2, p); diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/DependencyRenderer.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/DependencyRenderer.java index 62a81dba..4e9f8709 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/DependencyRenderer.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/DependencyRenderer.java @@ -131,7 +131,7 @@ public String render(ImplementationGuide ig, boolean QA, boolean details, boolea hasDesc = hasDesc || d.hasExtension(ToolingExtensions.EXT_IGDEP_COMMENT); } - HierarchicalTableGenerator gen = new HierarchicalTableGenerator(rc, dstFolder, true, true); + HierarchicalTableGenerator gen = new HierarchicalTableGenerator(rc, dstFolder, true, true, "dep"); TableModel model = createTable(gen, QA, hasDesc); String realm = determineRealmForIg(ig.getPackageId()); diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java index 29574c8e..2cbd0daf 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java @@ -139,7 +139,7 @@ public StructureDefinitionRenderer(IWorkerContext context, String corePath, Stru this.resE = ResourceWrapper.forResource(gen.getContextUtilities(), sd); } - public String summary() { + public String summary(boolean all) { try { if (sd.hasExtension(ToolingExtensions.EXT_SUMMARY)) { return processMarkdown("Profile Summary", (PrimitiveType) sd.getExtensionByUrl(ToolingExtensions.EXT_SUMMARY).getValue()); @@ -202,7 +202,7 @@ public String summary() { } } } - StringBuilder res = new StringBuilder(" \r\n

\r\n" + (gen.formatPhrase(RenderingContext.GENERAL_SUMM)) + "\r\n

\r\n"); + StringBuilder res = new StringBuilder(" \r\n

\r\n" + (gen.formatPhrase(RenderingContext.GENERAL_SUMM)) + "\r\n

\r\n"); if (ToolingExtensions.hasExtension(sd, ToolingExtensions.EXT_SUMMARY)) { Extension v = ToolingExtensions.getExtension(sd, ToolingExtensions.EXT_SUMMARY); res.append(processMarkdown("Profile.summary", (PrimitiveType) v.getValue())); @@ -482,7 +482,7 @@ public String snapshot(String defnFile, Set outputTracker, boolean toTab return ""; else { sdr.getContext().setStructureMode(mode); - return new XhtmlComposer(XhtmlComposer.HTML).compose(sdr.generateTable(new RenderingStatus(), defnFile, sd, false, destDir, false, sd.getId(), true, corePath, "", sd.getKind() == StructureDefinitionKind.LOGICAL, false, outputTracker, false, gen.withUniqueLocalPrefix(all ? "sa" :"s"), toTabs ? ANCHOR_PREFIX_SNAP : ANCHOR_PREFIX_SNAP, resE)); + return new XhtmlComposer(XhtmlComposer.HTML).compose(sdr.generateTable(new RenderingStatus(), defnFile, sd, false, destDir, false, sd.getId(), true, corePath, "", sd.getKind() == StructureDefinitionKind.LOGICAL, false, outputTracker, false, gen.withUniqueLocalPrefix(all ? "sa" : null), toTabs ? ANCHOR_PREFIX_SNAP : ANCHOR_PREFIX_SNAP, resE)); } } @@ -1512,8 +1512,8 @@ public String testscriptTable(List fileList) { return b.toString(); } - public String span(boolean onlyConstraints, String canonical, Set outputTracker) throws IOException, FHIRException { - return new XhtmlComposer(XhtmlComposer.HTML).compose(sdr.generateSpanningTable(sd, destDir, onlyConstraints, canonical, outputTracker)); + public String span(boolean onlyConstraints, String canonical, Set outputTracker, String anchorPrefix) throws IOException, FHIRException { + return new XhtmlComposer(XhtmlComposer.HTML).compose(sdr.generateSpanningTable(sd, destDir, onlyConstraints, canonical, outputTracker, anchorPrefix)); } public String pseudoJson() throws Exception { @@ -2255,9 +2255,9 @@ public String crumbTrail() { return b.toString(); } - public String expansion(String definitionsName, Set otherFilesRun) throws IOException { + public String expansion(String definitionsName, Set otherFilesRun, String anchorPrefix) throws IOException { PEBuilder pe = context.getProfiledElementBuilder(PEElementPropertiesPolicy.NONE, true); - HierarchicalTableGenerator gen = new HierarchicalTableGenerator(this.gen, destDir, true, true); + HierarchicalTableGenerator gen = new HierarchicalTableGenerator(this.gen, destDir, true, true, anchorPrefix); TableModel model = gen.initNormalTable(corePath, false, true, sd.getId()+"x", true, TableGenerationMode.XHTML); XhtmlNode x = null; diff --git a/pom.xml b/pom.xml index e61ec7ab..9eee8264 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.6.14-SNAPSHOT - 6.3.13 + 6.3.13-SNAPSHOT 3.0.0-M5 5.2.1 4.11.0 diff --git a/test-statistics.csv b/test-statistics.csv index 2cd2ae76..3423dacf 100644 --- a/test-statistics.csv +++ b/test-statistics.csv @@ -22,3 +22,4 @@ Version,example.fhir.uv.myig,fhir.base.template.ig,hl7.base.template.ig,hl7.cda. 1.6.10,28914,976,89,82047,361946,537,732105,483509,581468,17114,50571,194122,286561,39253,130276 1.6.11,70934,934,86,116436,616924,2171,1099334,680742,647631,39609,104800,409294,482237,63103,191082 1.6.12,71569,903,83,103551,317959,776,3358469,646846,693471,28496,83862,357892,482017,59380,191127 +1.6.13,,,,117746,,1434,,623214,,,86041,,,, diff --git a/test-statistics.json b/test-statistics.json index a7b3637a..156880d1 100644 --- a/test-statistics.json +++ b/test-statistics.json @@ -2471,5 +2471,37 @@ "time" : 482017, "memory" : 1640639464 } + }, + "1.6.13" : { + "sync-date" : "2024-06-30", + "date" : "2024-06-30", + "hl7.fhir.template.ig" : { + "errors" : 0, + "warnings" : 0, + "hints" : 0, + "time" : 1434, + "memory" : 11867728 + }, + "hl7.cda.uv.core" : { + "errors" : 113, + "warnings" : 142, + "hints" : 0, + "time" : 117746, + "memory" : 2706421672 + }, + "hl7.fhir.us.ecr" : { + "errors" : 5540, + "warnings" : 160, + "hints" : 112, + "time" : 623214, + "memory" : 9628041304 + }, + "hl7.fhir.uv.ipa" : { + "errors" : 108, + "warnings" : 20, + "hints" : 43, + "time" : 86041, + "memory" : 2045682336 + } } }