Merge pull request #64 from nsip/naplan-writing-print

Maintain paragraphing, remove escaped chars

nap-writing-print/html-sanitizer.go

@@ -4,6 +4,8 @@ package nap_writing_print
 
 import (
 	"context"
+	"html"
+	"strings"
 
 	"github.com/microcosm-cc/bluemonday"
 )
@@ -25,8 +27,21 @@ func createHtmlSanitizer(ctx context.Context, in <-chan map[string]string) (
 			rmap := rMap
 
 			p := bluemonday.StrictPolicy()
-			html := p.Sanitize(rmap["Item Response"])
-			rmap["Item Response"] = html
+			// keep paragraph markers to preserve layout in pdf printing
+			p.AllowElements("p")
+			sanitizedHtml := p.Sanitize(rmap["Item Response"])
+			// now unescape the html for speech marks, apostrophe's etc. for printing
+			unescapedHtml := html.UnescapeString(sanitizedHtml)
+
+			// remove unnecessary characters
+			// remove non-breaking spaces and line feeds & backticks
+			noBrHtml := strings.Replace(unescapedHtml, "&nbsp;", " ", -1)
+			noLfHtml := strings.Replace(noBrHtml, "\\n", "", -1)
+
+			// remove end-of para markers, not needed for pdf print
+			noEndParaHtml := strings.Replace(noLfHtml, "</p>", "", -1)
+
+			rmap["Item Response"] = noEndParaHtml
 
 			select {
 			case out <- rmap:

nap-writing-print/script-writer.go

@@ -35,13 +35,13 @@ func createScriptWriter(ctx context.Context, in <-chan map[string]string) (<-cha
 			doc.SetColor("black").
 				SetFont("Helvetica-Bold", 24).
 				SetXY(3.5, 2.7).DrawText(rmap["Anonymised Id"])
-			//
-			// draw the column of text
-			var colText = strings.Replace(rmap["Item Response"], "\\n", " ", -1)
+
+			colText := splitParas(rmap["Item Response"])
 			doc.SetColor("black").
 				SetFont("Helvetica", 12).
 				// DrawUnitGrid().
 				DrawTextInBox(3.5, 4, 12, 28, "LT", colText)
+
 			//
 			// save the files
 			doc.SaveFile(outputFile1)
@@ -57,3 +57,13 @@ func createScriptWriter(ctx context.Context, in <-chan map[string]string) (<-cha
 	return errc, nil
 
 }
+
+//
+// use the paragraph markers that have been left in the text
+// to insert spacing characters.
+//
+func splitParas(fullText string) string {
+
+	return strings.Replace(fullText, "<p>", "\n\n", -1)
+
+}