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

Jump to bottom

2024 10 gg qa versions #974

Closed
wants to merge 3 commits into from
Closed

2024 10 gg qa versions #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1917a48
Fix missing examples tab for profiles + fix csv escaping problem + fi…
Oct 21, 2024
9bcf077
Add version warnings on IGs to qa.html
Oct 21, 2024
23f4cf3
upgrade minor version
Oct 22, 2024
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
21 changes: 12 additions & 9 deletions org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@ public void createIg() throws Exception, IOException, EOperationOutcome, FHIRExc
new DependencyRenderer(pcm, outputDir, npmName, templateManager, dependencyList, context, markdownEngine, rc, specMaps).render(publishedIg, true, false, false), new HTAAnalysisRenderer(context, outputDir, markdownEngine).render(publishedIg.getPackageId(), fileList, publishedIg.present()),
new PublicationChecker(repoRoot, historyPage, markdownEngine, findReleaseLabelString()).check(), renderGlobals(), copyrightYear, context, scanForR5Extensions(), modifierExtensions,
generateDraftDependencies(),
noNarrativeResources, noValidateResources, validationOff, generationOff, dependentIgFinder, context.getTxClientManager());
noNarrativeResources, noValidateResources, validationOff, generationOff, dependentIgFinder, context.getTxClientManager(), versionProblems);
val.setValidationFlags(hintAboutNonMustSupport, anyExtensionsAllowed, checkAggregation, autoLoad, showReferenceMessages, noExperimentalContent, displayWarnings);
tts.end();
if (isChild()) {
Expand Down Expand Up @@ -4131,6 +4131,7 @@ private void loadIGPackage(String name, String canonical, String packageId, Stri
specMaps.add(igm);
if (!VersionUtilities.versionsCompatible(version, igm.getVersion())) {
if (!pi.isWarned()) {
versionProblems.add("This IG is version "+version+", while the IG '"+pi.name()+"' is from version "+igm.getVersion());
log("Version mismatch. This IG is version "+version+", while the IG '"+pi.name()+"' is from version "+igm.getVersion()+" (will try to run anyway)");
pi.setWarned(true);
}
Expand Down Expand Up @@ -4187,6 +4188,7 @@ public void loadFromPackage(String name, String canonical, NpmPackage pi, String
} else {
if (!VersionUtilities.versionsCompatible(version, pi.fhirVersion())) {
if (!pi.isWarned()) {
versionProblems.add("This IG is for FHIR version "+version+", while the package '"+pi.name()+"#"+pi.version()+"' is for FHIR version "+pi.fhirVersion());
log("Version mismatch. This IG is for FHIR version "+version+", while the package '"+pi.name()+"#"+pi.version()+"' is for FHIR version "+pi.fhirVersion()+" (will ignore that and try to run anyway)");
pi.setWarned(true);
}
Expand Down Expand Up @@ -7683,11 +7685,10 @@ private void generate() throws Exception {
}
logMessage("Generate Summaries");

genBasePages();

if (!changeList.isEmpty()) {
generateSummaryOutputs(db);
}
genBasePages();
db.closeUp();
TextFile.bytesToFile(extensionTracker.generate(), Utilities.path(tempDir, "usage-stats.json"));
try {
Expand Down Expand Up @@ -9143,7 +9144,7 @@ private void saveCSList(String name, List<CodeSystem> cslist, DBBuilder db, int
JsonArray items = new JsonArray();
json.add("codeSystems", items);

b.append("URL,Version,Status,OIDs,Name,Title,Descriptino,Used\r\n");
b.append("URL,Version,Status,OIDs,Name,Title,Description,Used\r\n");

for (CodeSystem cs : cslist) {

Expand Down Expand Up @@ -9195,9 +9196,9 @@ private void saveCSList(String name, List<CodeSystem> cslist, DBBuilder db, int
b.append(",");
b.append(oids.isEmpty() ? "" : "\""+CommaSeparatedStringBuilder.join(",", oids)+"\"");
b.append(",");
b.append(cs.getName());
b.append(Utilities.escapeCSV(cs.getName()));
b.append(",");
b.append(cs.getTitle());
b.append(Utilities.escapeCSV(cs.getTitle()));
b.append(",");
b.append("\""+Utilities.escapeCSV(cs.getDescription())+"\"");
b.append(",");
Expand Down Expand Up @@ -9285,9 +9286,9 @@ private void saveVSList(String name, List<ValueSet> vslist, DBBuilder db, int vi
b.append(",");
b.append(oids.isEmpty() ? "" : "\""+CommaSeparatedStringBuilder.join(",", oids)+"\"");
b.append(",");
b.append(vs.getName());
b.append(Utilities.escapeCSV(vs.getName()));
b.append(",");
b.append(vs.getTitle());
b.append(Utilities.escapeCSV(vs.getTitle()));
b.append(",");
b.append("\""+Utilities.escapeCSV(vs.getDescription())+"\"");
b.append(",");
Expand Down Expand Up @@ -11145,6 +11146,8 @@ private String processRefTag(DBBuilder db, String src, FetchedFile f) {
private LanguageUtils langUtils;

private boolean simplifierMode;

private List<String> versionProblems = new ArrayList<>();

private String processSQLCommand(DBBuilder db, String src, FetchedFile f) throws FHIRException, IOException {
long start = System.currentTimeMillis();
Expand Down Expand Up @@ -12003,7 +12006,7 @@ private void generateHtml(FetchedFile f, FetchedResource r, Map<String, String>
XhtmlComposer xc = new XhtmlComposer(XhtmlComposer.XML, module.isNoNarrative());
if (igpkp.wantGen(r, "html")) {
long start = System.currentTimeMillis();
XhtmlNode xhtml = (lang == null || lang.equals(r.getElement().getNamedChildValue("language"))) ? null : getXhtml(f, r);
XhtmlNode xhtml = (lang == null || lang.equals(r.getElement().getNamedChildValue("language"))) ? getXhtml(f, r) : null;
if (xhtml == null && HistoryGenerator.allEntriesAreHistoryProvenance(r.getElement())) {
RenderingContext ctxt = lrc.copy(false).setParser(getTypeLoader(f, r));
List<ProvenanceDetails> entries = loadProvenanceForBundle(igpkp.getLinkFor(r, true), r.getElement(), f);
Expand Down
31 changes: 28 additions & 3 deletions ...fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/ValidationPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,14 @@ public ValidationMessage getVm() {
boolean showReferenceMessages = false;
boolean noExperimentalContent = false;
boolean displayWarnings = false;
private List<String> versionProblems;


public ValidationPresenter(String statedVersion, String igVersion, IGKnowledgeProvider provider, IGKnowledgeProvider altProvider, String root, String packageId, String altPackageId,
String toolsVersion, String currentToolsVersion, RealmBusinessRules realm, PreviousVersionComparator previousVersionComparator, IpaComparator ipaComparator, IpsComparator ipsComparator,
String dependencies, String csAnalysis, String pubReqCheck, String globalCheck, String copyrightYear, IWorkerContext context,
Set<String> r5Extensions, List<StructureDefinition> modifierExtensions, String draftDependencies,
List<FetchedResource> noNarratives, List<FetchedResource> noValidation, boolean noValidate, boolean noGenerate, DependentIGFinder dependentIgs, TerminologyClientManager txServers) {
List<FetchedResource> noNarratives, List<FetchedResource> noValidation, boolean noValidate, boolean noGenerate, DependentIGFinder dependentIgs, TerminologyClientManager txServers, List<String> versionProblems) {
super();
this.statedVersion = statedVersion;
this.igVersion = igVersion;
Expand Down Expand Up @@ -341,6 +342,7 @@ public ValidationPresenter(String statedVersion, String igVersion, IGKnowledgePr
this.draftDependencies = draftDependencies;
this.globalCheck = globalCheck;
this.txServers = txServers;
this.versionProblems = versionProblems;
ruleDateCutoff = Date.from(LocalDate.now().minusMonths(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
determineCode();
}
Expand Down Expand Up @@ -733,6 +735,10 @@ public List<FetchedFile> genQAHtml(String title, List<FetchedFile> files, String
b.append(genEnd());
b.append(genStartInternal());
int id = 0;
for (String vp : versionProblems) {
b.append(genDetails(vp, id));
id++;
}
for (ValidationMessage vm : linkErrors) {
b.append(genDetails(vm, id));
id++;
Expand Down Expand Up @@ -1032,12 +1038,12 @@ public static List<ValidationMessage> filterMessages(List<ValidationMessage> mes

private final String detailsTemplateTxLink =
" <tr style=\"background-color: $color$\">\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$</ta>, see <a href=\"$tx$\">log</a>)</td>\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$<ta>, see <a href=\"$tx$\">log</a>)</td>\r\n"+
" </tr>\r\n";

private final String detailsTemplateTxNoLink =
" <tr style=\"background-color: $color$\">\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$</ta>)</td>\r\n"+
" <td><b>$path$</b></td><td><b>$level$</b></td><td><b>$msg$</b>$comment$ (from <a href=\"qa-txservers.html#$txsrvr$\">$txsrvr$<ta>)</td>\r\n"+
" </tr>\r\n";

private final String detailsTemplateWithExtraDetails =
Expand Down Expand Up @@ -1543,6 +1549,25 @@ private String genDetails(ValidationMessage vm, int id) {
return t.render();
}

private String genDetails(String vp, int id) {
String tid = null;
tid = detailsTemplate;
ST t = template(tid);
t.add("path", "");
t.add("pathlink", "");
t.add("level", "warning");
t.add("color", colorForLevel(IssueSeverity.WARNING, false));
t.add("halfcolor", halfColorForLevel(IssueSeverity.WARNING, false));
t.add("id", "l"+id);
t.add("mid", "");
t.add("msg", vp);
t.add("msgdetails", vp);
t.add("comment", "");
t.add("tx", "");
t.add("txsrvr", "");
return t.render();
}

private String getServer(String server) {
if (txServers.getServerMap().containsKey(server)) {
return txServers.getServerMap().get(server).getClient().getAddress();
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

<groupId>org.hl7.fhir.publisher</groupId>
<artifactId>org.hl7.fhir.publisher</artifactId>
<version>1.6.32-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<core_version>6.3.32</core_version>
<core_version>6.4.0-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.11.0</okhttp.version>
Expand Down
Loading