From 2869c589cdb18e1b94be640af6c3b65a197833d6 Mon Sep 17 00:00:00 2001
From: Branden Phillips
Date: Thu, 27 Feb 2020 16:55:05 -0700
Subject: bug[TW16646]: Adjust expressions for publishing to handle footers and
 section breaks

Change-Id: I63ef1b9503d64960ef1725d80d5686f41e853853
Signed-off-by: Branden Phillips <branden.w.phillips@boeing.com>
---
 .../internal/wordupdate/WordTemplateContentRendererHandler.java   | 1 +
 .../src/org/eclipse/osee/framework/core/util/ReportConstants.java | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordTemplateContentRendererHandler.java b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordTemplateContentRendererHandler.java
index a4dc6b1ea41..956e5b9d988 100644
--- a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordTemplateContentRendererHandler.java
+++ b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordTemplateContentRendererHandler.java
@@ -89,6 +89,7 @@ public class WordTemplateContentRendererHandler {
             // if no extra paragraphs have been added this will replace the normal footer
             data = data.replaceAll(ReportConstants.ENTIRE_FTR_EXTRA_PARA, "");
             data = data.replaceAll(ReportConstants.ENTIRE_FTR, "");
+            data = data.replaceAll(ReportConstants.EMPTY_SECTION_BREAK, ReportConstants.PAGE_BREAK);
             data = data.replaceAll(ReportConstants.NO_DATA_RIGHTS, "");
 
             if (wtcData.getIsEdit() && !data.contains("<w:tbl>")) {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/ReportConstants.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/ReportConstants.java
index 2ee61d0554a..7e4da9dc8b2 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/ReportConstants.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/ReportConstants.java
@@ -23,12 +23,13 @@ public class ReportConstants {
    public static final String FTR = "<w:ftr[\\s\\S]+?</w:ftr>";
    public static final String PAGE_SZ = "<w:pgSz [^>]*/>";
    public static final String ENTIRE_FTR_EXTRA_PARA =
-      "<w:p[^>]*><w:pPr><w:spacing w:after=\"[\\d]*\"[^>]*>(</w:spacing>)*<w:sectPr[^>]*>(<w:r><w:t>)?<w:ftr[^>]*>[\\s\\S]+</w:ftr>[\\s\\S]+</w:sectPr></w:pPr></w:p>";
-   public static final String ENTIRE_FTR =
-      "<w:p[^>]*><w:pPr><w:sectPr[^>]*><w:ftr[\\s\\S]+?</w:ftr>[\\s\\S]+?</w:sectPr></w:pPr></w:p>";
+      "<w:p[^>]*><w:pPr>(<w:spacing w:after=\"[\\d]*\"[^>]*>)*(</w:spacing>)*<w:sectPr[^>]*>(<w:r><w:t>)?<w:ftr[^>]*>[\\s\\S]+</w:ftr>[\\s\\S]+</w:sectPr></w:pPr></w:p>";
+   public static final String ENTIRE_FTR = "<w:sectPr[^>]*><w:ftr[\\s\\S]+?</w:ftr>[\\s\\S]+?</w:sectPr>";
    public static final String FULL_PARA_END = "</w:pPr></w:p>";
    public static final String NO_DATA_RIGHTS =
       "<w:p>[\\s||\\S]+?<w:r><w:t>NO DATA RIGHTS ARTIFACT FOUND</w:t></w:r>[\\s\\S]+?</w:p>";
+   public static final String EMPTY_SECTION_BREAK =
+      "<w:sectPr[^>]*><w:pgSz[^>]*></w:pgSz><w:pgMar[^>]*></w:pgMar><w:cols[^>]*></w:cols></w:sectPr>";
 
    //wordml
    public static final String PG_SZ = "<w:pgSz w:w=\"12240\" w:h=\"15840\" w:code=\"1\"/>";
@@ -55,6 +56,7 @@ public class ReportConstants {
    public static final String BULLETSYM = "<w:t></w:t>";
    public static final String OLD_BULLET_STYLE = "bullettight1";
    public static final String NEW_BULLET_STYLE = "bulletlvl2";
+   public static final String PAGE_BREAK = "<w:r><w:br w:type=\"page\"/></w:r>";
    public static final String PARA_REGEX = "<w:p(.*?)>";
    public static final String PARA_PROP_START = "<w:pPr>";
    public static final String PARA_PROP_REGEX = PARA_PROP_START + "(.*?)</w:pPr>";
-- 
cgit v1.2.3