From 3f2b18a4e756897031e3ae1b6316744f2f292a5b Mon Sep 17 00:00:00 2001 From: orbiter Date: Tue, 26 Feb 2008 21:17:41 +0000 Subject: [PATCH] fix for http://forum.yacy-websuche.de/viewtopic.php?f=5&t=905&hilit=&p=5979#p5979 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4513 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/ViewFile.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index faa66f3ec..ef3a55f5c 100644 --- a/htroot/ViewFile.java +++ b/htroot/ViewFile.java @@ -241,6 +241,8 @@ public class ViewFile { prop.put("viewMode", VIEW_MODE_NO_TEXT); return prop; } + + String[] wordArray = wordArray(post.get("words", null)); if (viewMode.equals("plain")) { @@ -262,11 +264,9 @@ public class ViewFile { } } - content = content.replaceAll("\n", "
").replaceAll("\t", "    "); - prop.put("error", "0"); prop.put("viewMode", VIEW_MODE_AS_PLAIN_TEXT); - prop.putHTML("viewMode_plainText", content); + prop.put("viewMode_plainText", markup(wordArray, content).replaceAll("\n", "
").replaceAll("\t", "    ")); } else if (viewMode.equals("iframe")) { prop.put("viewMode", VIEW_MODE_AS_IFRAME); @@ -298,15 +298,13 @@ public class ViewFile { } resMime = document.dc_format(); - String[] wordArray = wordArray(post.get("words", null)); - + if (viewMode.equals("parsed")) { String content = new String(document.getTextBytes()); // content = wikiCode.replaceHTML(content); // added by Marc Nause - content = content.replaceAll("\n", "
").replaceAll("\t", "    "); prop.put("viewMode", VIEW_MODE_AS_PARSED_TEXT); - prop.put("viewMode_parsedText", markup(wordArray, content)); + prop.put("viewMode_parsedText", markup(wordArray, content).replaceAll("\n", "
").replaceAll("\t", "    ")); } else if (viewMode.equals("sentences")) { prop.put("viewMode", VIEW_MODE_AS_PARSED_SENTENCES);