ConverterEngine: Get the versionComment from the Page, and insert it into
the pageTable. Also, if the page author is not set, and an origAuthor is set,
inject a prefix "[Original edit by XXX] " into the versionComment.
diff --git a/src/main/java/com/atlassian/uwc/ui/ConverterEngine.java b/src/main/java/com/atlassian/uwc/ui/ConverterEngine.java
index 3274b7e..df3fd6a 100644
--- a/src/main/java/com/atlassian/uwc/ui/ConverterEngine.java
+++ b/src/main/java/com/atlassian/uwc/ui/ConverterEngine.java
@@ -2236,11 +2236,23 @@
*/
private Hashtable createPageTable(Page page, String parentId) {
Hashtable table = new Hashtable();
+ String versionComment = page.getVersionComment();
+ // Inject origAuthor in versionComment if the author is not set or is SYSTEM
+ if ((page.getAuthor() == null || page.getAuthor().equals("SYSTEM"))
+ && (page.getOrigAuthor() != null)) {
+ String versionCommentPrefix = "[Original edit by " + page.getOrigAuthor() + "]";
+ if (versionComment != null && !versionComment.isEmpty()) {
+ versionComment = versionCommentPrefix + " " + versionComment;
+ } else {
+ versionComment = versionCommentPrefix;
+ }
+ }
if (page.getConvertedText() == null) page.setConvertedText("");
table.put("content", page.getConvertedText());
table.put("title", page.getName());
if (parentId != null && !parentId.equals("null")) table.put("parentId", parentId);
if (page.getVersion() > 0) table.put("version", page.getVersion() + "");
+ if (versionComment != null) table.put("versionComment", versionComment);
if (page.isBlog() && page.getId() != null) table.put("id", page.getId());
return table;
}
