Author: orbiter Date: 2008-02-26 22:17:41 +0100 (Tue, 26 Feb 2008) New Revision: 4513
Modified: trunk/htroot/ViewFile.java Log: fix for http://forum.yacy-websuche.de/viewtopic.php?f=5&t=905&hilit=&p=5979#p5979 Modified: trunk/htroot/ViewFile.java =================================================================== --- trunk/htroot/ViewFile.java 2008-02-26 15:32:25 UTC (rev 4512) +++ trunk/htroot/ViewFile.java 2008-02-26 21:17:41 UTC (rev 4513) @@ -241,6 +241,8 @@ prop.put("viewMode", VIEW_MODE_NO_TEXT); return prop; } + + String[] wordArray = wordArray(post.get("words", null)); if (viewMode.equals("plain")) { @@ -262,11 +264,9 @@ } } - content = content.replaceAll("\n", "<br />").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", "<br />").replaceAll("\t", " ")); } else if (viewMode.equals("iframe")) { prop.put("viewMode", VIEW_MODE_AS_IFRAME); @@ -298,15 +298,13 @@ } 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", "<br />").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", "<br />").replaceAll("\t", " ")); } else if (viewMode.equals("sentences")) { prop.put("viewMode", VIEW_MODE_AS_PARSED_SENTENCES); _______________________________________________ YaCy-svn mailing list YaCy-svn@lists.berlios.de https://lists.berlios.de/mailman/listinfo/yacy-svn
