From 1fad291255e5788100dc2850145e72651a683c02 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 18 Jul 2012 13:04:30 -0400
Subject: [PATCH] TSK-546 Extracted content Arabic files issue fixes issue when
 content was escaped twice in some cases, if set node called multiple times on
 the same content (that should be looked at too)

---
 .../autopsy/keywordsearch/ExtractedContentViewer.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
index 7cb62bbfd3..4249618fa4 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
@@ -158,9 +158,9 @@ public class ExtractedContentViewer implements DataContentViewer {
                 @Override
                 public String getMarkup() {
                     try {
-                        curContent = StringEscapeUtils.escapeHtml(getSolrContent(selectedNode, currentPage, hasChunks));
-                        curContent = "<pre>" + curContent.trim() + "</pre>";
-                        return curContent;
+                        curContent = getSolrContent(selectedNode, currentPage, hasChunks);
+                        String curContentTrimmed = "<pre>" + curContent.trim() + "</pre>";
+                        return curContentTrimmed;
                     } catch (SolrServerException ex) {
                         logger.log(Level.WARNING, "Couldn't get extracted content.", ex);
                         return "";
@@ -418,7 +418,10 @@ public class ExtractedContentViewer implements DataContentViewer {
 
         //not cached
         try {
-            curContent = solrServer.getSolrContent(contentObj, chunkId);
+            curContent = StringEscapeUtils.escapeHtml(solrServer.getSolrContent(contentObj, chunkId)).trim();
+            StringBuilder sb = new StringBuilder(curContent.length() + 20);
+            sb.append("<pre>").append(curContent).append("</pre>");
+            curContent = sb.toString();
             curContentId = contentId;
             curContentChunk = chunkId;
         } catch (NoOpenCoreException ex) {