boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

- fix for http://www.yacy-forum.de/viewtopic.php?t=3483

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3330 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
karlchenofhell 18 years ago
parent 6667930352
commit 3bafd643c0
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
htroot/ViewFile.html
Unescape View File

@ -82,7 +82,7 @@
<td>#[nr]#</td> <td>#[nr]#</td>
<td class="tt">#[type]#</tt></td> <td class="tt">#[type]#</tt></td>
<td class="tt">#[text]#</tt></td> <td class="tt">#[text]#</tt></td>
<td class="tt">#[link]#</tt></td> <td class="tt"><a href="#[url]#">#[link]#</a></tt></td>
<td class="tt">#[attr]#</tt></td> <td class="tt">#[attr]#</tt></td>
</tr>#{/links}# </tr>#{/links}#
</table> </table>

32
htroot/ViewFile.java
Unescape View File

@ -88,7 +88,7 @@ public class ViewFile {
plasmaSwitchboard sb = (plasmaSwitchboard)env; plasmaSwitchboard sb = (plasmaSwitchboard)env;
if (post != null && post.containsKey("words")) if (post != null && post.containsKey("words"))
prop.put("error_words", wikiCode.replaceXMLEntities((String)post.get("words"))); prop.put("error_words", (String)post.get("words"));
else { else {
prop.put("error", 1); prop.put("error", 1);
prop.put("viewmode", 0); prop.put("viewmode", 0);
@ -262,8 +262,7 @@ public class ViewFile {
} }
} }
content = wikiCode.replaceXMLEntities( content = content.replaceAll("\n", "<br />").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
content.replaceAll("\n", "<br />").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"));
prop.put("error", 0); prop.put("error", 0);
prop.put("viewMode", VIEW_MODE_AS_PLAIN_TEXT); prop.put("viewMode", VIEW_MODE_AS_PLAIN_TEXT);
@ -271,7 +270,7 @@ public class ViewFile {
} else if (viewMode.equals("iframe")) { } else if (viewMode.equals("iframe")) {
prop.put("viewMode", VIEW_MODE_AS_IFRAME); prop.put("viewMode", VIEW_MODE_AS_IFRAME);
prop.put("viewMode_url", wikiCode.replaceXMLEntities(url.toNormalform())); prop.put("viewMode_url", url.toNormalform());
} else if (viewMode.equals("parsed") || viewMode.equals("sentences") || viewMode.equals("links")) { } else if (viewMode.equals("parsed") || viewMode.equals("sentences") || viewMode.equals("links")) {
// parsing the resource content // parsing the resource content
@ -303,11 +302,11 @@ public class ViewFile {
if (viewMode.equals("parsed")) { if (viewMode.equals("parsed")) {
String content = new String(document.getTextBytes()); String content = new String(document.getTextBytes());
content = wikiCode.replaceHTML(content); // added by Marc Nause // content = wikiCode.replaceHTML(content); // added by Marc Nause
content = content.replaceAll("\n", "<br />").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"); content = content.replaceAll("\n", "<br />").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
prop.put("viewMode", VIEW_MODE_AS_PARSED_TEXT); prop.put("viewMode", VIEW_MODE_AS_PARSED_TEXT);
prop.put("viewMode_parsedText", markup(wordArray, content)); prop.putASIS("viewMode_parsedText", markup(wordArray, content));
} else if (viewMode.equals("sentences")) { } else if (viewMode.equals("sentences")) {
prop.put("viewMode", VIEW_MODE_AS_PARSED_SENTENCES); prop.put("viewMode", VIEW_MODE_AS_PARSED_SENTENCES);
@ -323,7 +322,7 @@ public class ViewFile {
sentence = ((StringBuffer) sentences.next()).toString(); sentence = ((StringBuffer) sentences.next()).toString();
if (sentence.trim().length() > 0) { if (sentence.trim().length() > 0) {
prop.put("viewMode_sentences_" + i + "_nr", Integer.toString(i + 1)); prop.put("viewMode_sentences_" + i + "_nr", Integer.toString(i + 1));
prop.put("viewMode_sentences_" + i + "_text", markup(wordArray, sentence)); prop.putASIS("viewMode_sentences_" + i + "_text", markup(wordArray, sentence));
prop.put("viewMode_sentences_" + i + "_dark", ((dark) ? 1 : 0)); prop.put("viewMode_sentences_" + i + "_dark", ((dark) ? 1 : 0));
dark = !dark; dark = !dark;
i++; i++;
@ -349,9 +348,13 @@ public class ViewFile {
prop.put("viewMode_links_" + i + "_nr", i); prop.put("viewMode_links_" + i + "_nr", i);
prop.put("viewMode_links_" + i + "_dark", ((dark) ? 1 : 0)); prop.put("viewMode_links_" + i + "_dark", ((dark) ? 1 : 0));
prop.put("viewMode_links_" + i + "_type", "image"); prop.put("viewMode_links_" + i + "_type", "image");
prop.put("viewMode_links_" + i + "_text", markup(wordArray, entry.alt())); prop.putASIS("viewMode_links_" + i + "_text", markup(wordArray, entry.alt()));
prop.put("viewMode_links_" + i + "_link", "<a href=\"" + (String) entry.url().toNormalform() + "\">" + markup(wordArray, (String) entry.url().toNormalform()) + "</a>"); prop.put("viewMode_links_" + i + "_url", (String) entry.url().toNormalform());
prop.put("viewMode_links_" + i + "_attr", entry.width() + "&nbsp;x&nbsp;" + entry.height()); prop.putASIS("viewMode_links_" + i + "_link", markup(wordArray, (String) entry.url().toNormalform()));
if (entry.width() > 0 && entry.height() > 0)
prop.putASIS("viewMode_links_" + i + "_attr", entry.width() + "x" + entry.height() + " Pixel");
else
prop.put("viewMode_links_" + i + "_attr", "unknown");
dark = !dark; dark = !dark;
i++; i++;
} }
@ -361,7 +364,7 @@ public class ViewFile {
if (document != null) document.close(); if (document != null) document.close();
} }
prop.put("error", 0); prop.put("error", 0);
prop.put("error_url", wikiCode.replaceXMLEntities(url.toNormalform())); prop.put("error_url", url.toNormalform());
prop.put("error_hash", urlHash); prop.put("error_hash", urlHash);
prop.put("error_wordCount", Integer.toString(wordCount)); prop.put("error_wordCount", Integer.toString(wordCount));
prop.put("error_desc", descr); prop.put("error_desc", descr);
@ -382,10 +385,11 @@ public class ViewFile {
} }
private static final String markup(String[] wordArray, String message) { private static final String markup(String[] wordArray, String message) {
message = wikiCode.replaceHTML(message); message = wikiCode.replaceXMLEntities(message);
if (wordArray != null) if (wordArray != null)
for (int j = 0; j < wordArray.length; j++) { for (int j = 0; j < wordArray.length; j++) {
String currentWord = wordArray[j].trim(); String currentWord = wordArray[j].trim();
// TODO: replace upper-/lowercase words as well
message = message.replaceAll(currentWord, message = message.replaceAll(currentWord,
"<span class=\"" + HIGHLIGHT_CSS + ((j % MAX_HIGHLIGHTS) + 1) + "\">" + "<span class=\"" + HIGHLIGHT_CSS + ((j % MAX_HIGHLIGHTS) + 1) + "\">" +
currentWord + currentWord +
@ -403,8 +407,8 @@ public class ViewFile {
prop.put("viewMode_links_" + c + "_nr", c); prop.put("viewMode_links_" + c + "_nr", c);
prop.put("viewMode_links_" + c + "_dark", ((dark) ? 1 : 0)); prop.put("viewMode_links_" + c + "_dark", ((dark) ? 1 : 0));
prop.put("viewMode_links_" + c + "_type", name); prop.put("viewMode_links_" + c + "_type", name);
prop.put("viewMode_links_" + c + "_text", markup(wordArray, (String) entry.getValue())); prop.putASIS("viewMode_links_" + c + "_text", markup(wordArray, (String) entry.getValue()));
prop.put("viewMode_links_" + c + "_link", "<a href=\"" + (String) entry.getKey() + "\">" + markup(wordArray, (String) entry.getKey()) + "</a>"); prop.putASIS("viewMode_links_" + c + "_link", markup(wordArray, (String) entry.getKey()));
prop.put("viewMode_links_" + c + "_attr", ""); prop.put("viewMode_links_" + c + "_attr", "");
dark = !dark; dark = !dark;
c++; c++;

Write Preview
Loading…
Cancel
Save