From 78f6a1656b4987dbdcf32b0226183143a6cf0cc8 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Tue, 19 Mar 2024 20:50:55 +1100
Subject: [PATCH] Fix narrative generation

---
 .../hl7/fhir/tools/publisher/Publisher.java   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java b/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java
index 3104c8f..8f6db9c 100644
--- a/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java
+++ b/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java
@@ -824,6 +824,7 @@ public void execute(String folder, String[] args) throws IOException {
       if (isGenerate && buildFlags.get("all"))
         produceQA();
 
+      page.log("Max Memory Used = "+Utilities.describeSize(page.getMaxMemory()), LogMessageType.Process);
       if (!buildFlags.get("all")) {
         page.log("This was a Partial Build", LogMessageType.Process);
         CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder();
@@ -1871,13 +1872,13 @@ private void addTypes(CodeSystem cs, StructureDefinition sd, List<ConceptDefinit
     cd.setDisplay(sd.getType());
     cd.setDefinition(sd.getDescription());
     if (!sd.getType().equals("Base")) {
-      CodeSystemUtilities.setProperty(cs, cd, "kind", new CodeType(codeForKind(sd)));
+      CodeSystemUtilities.setProperty(cs, cd, "http://hl7.org/fhir/type-properties#kind", "kind", new CodeType(codeForKind(sd)));
     }
     if (sd.getAbstract()) {
-      CodeSystemUtilities.setProperty(cs, cd, "abstract-type", new BooleanType(true));
+      CodeSystemUtilities.setProperty(cs, cd, "http://hl7.org/fhir/type-properties#abstract-type", "abstract-type", new BooleanType(true));
     }
     if (sd.hasExtension(ToolingExtensions.EXT_RESOURCE_INTERFACE)) {
-      CodeSystemUtilities.setProperty(cs, cd, "interface", new BooleanType(true));
+      CodeSystemUtilities.setProperty(cs, cd, "http://hl7.org/fhir/type-properties#interface", "interface", new BooleanType(true));
     }
     list.add(cd);
     for (StructureDefinition t : types) {
@@ -5269,21 +5270,24 @@ private void processExample(Example e, ResourceDefn resn, StructureDefinition pr
           }
         }
       }
-      if (e.getResource() == null && e.getElement() == null) {
-        String xml = XMLUtil.elementToString(e.getXml().getDocumentElement()).replace("<?xml version=\"1.0\" encoding=\"UTF-16\"?>", "").trim();
-        e.setElement(new Manager().parseSingle(page.getWorkerContext(), new StringInputStream(xml), FhirFormat.XML));
-        e.setResource(new XmlParser().parse(xml));
-      }
     } catch (Throwable ex) {
       StringWriter errors = new StringWriter();
       System.out.println("Error generating narrative for example "+e.getName()+": "+ex.getMessage());
-//      ex.printStackTrace();
+      ex.printStackTrace();
       XhtmlNode xhtml = new XhtmlNode(NodeType.Element, "div");
       xhtml.addTag("p").setAttribute("style", "color: maroon").addText("Error processing narrative: " + ex.getMessage());
       xhtml.addTag("p").setAttribute("style", "color: maroon").addText(errors.toString());
       narrative = new XhtmlComposer(XhtmlComposer.HTML).compose(xhtml);
     }
-
+    try {
+      if (e.getResource() == null && e.getElement() == null) {
+        String xml = XMLUtil.elementToString(e.getXml().getDocumentElement()).replace("<?xml version=\"1.0\" encoding=\"UTF-16\"?>", "").trim();
+        e.setElement(new Manager().parseSingle(page.getWorkerContext(), new StringInputStream(xml), FhirFormat.XML));
+        e.setResource(new XmlParser().parse(xml));
+      }
+    } catch (Throwable ex) {
+      System.out.println("Error reparsing example "+e.getName()+": "+ex.getMessage());
+    }
     if (rt.equals("ValueSet")) {
       try {
         ValueSet vs = (ValueSet) loadExample(file);