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

*) added headlines as proposed by Vega

Browse Source 
*) <pre> will be displayed monospaced in wiki and blog again
*) bugfix for <pre> spanning multiple lines
*) replaced deprecated <s> tag with <span> equivalent

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7262 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
low012 14 years ago
parent f035f257da
commit dc40f51b8d
2 changed files with 133 additions and 56 deletions
Show Stats Download Patch File Download Diff File

10
htroot/env/base.css vendored
Unescape View File

@ -16,7 +16,7 @@
# i.e. ".strong"; ".left"; ".error"; # i.e. ".strong"; ".left"; ".error";
############################################### ###############################################
## "privat classes" ## ## "privat classes" ##
# all htnml-elements with a specific class # all HTML-elements with a specific class
# i.e. "div.content"; "span.left"; # i.e. "div.content"; "span.left";
# and # and
# "div.content span a."; "form.search fieldset legend"; # "div.content span a."; "form.search fieldset legend";
@ -117,6 +117,10 @@ margin-bottom:0px;
vertical-align:text-bottom; vertical-align:text-bottom;
} }
pre {
font-family:monospace;
}
/* --------------- global classes --------------------- */ /* --------------- global classes --------------------- */
tt, *.tt { tt, *.tt {
@ -163,6 +167,10 @@ tt, *.tt {
font-weight:bold; font-weight:bold;
} }
.strike {
text-decoration: line-through;
}
.Headline { .Headline {
font-weight: bold; font-weight: bold;
font-size: 160%; font-size: 160%;

179
source/de/anomic/data/wiki/wikiCode.java
Unescape View File

@ -1,4 +1,4 @@
// wikiCode.java // wikiCode.java
// ------------------------------------- // -------------------------------------
// part of YACY // part of YACY
// //
@ -36,10 +36,10 @@ import net.yacy.document.parser.html.CharacterCoding;
import de.anomic.server.serverCore; import de.anomic.server.serverCore;
/** This class provides methods to handle texts that have been posted in the yacyWiki or other /** This class provides methods to handle texts that have been posted in the yacyWiki or other
* parts of YaCy that use this class, like the blog or the profile. * parts of YaCy that use this class, like the blog or the profile.
* *
* @author Alexander Schier [AS], Franz Brausze [FB], Marc Nause [MN] * @author Alexander Schier [AS], Franz Brausze [FB], Marc Nause [MN]
*/ */
public class wikiCode extends abstractWikiParser implements wikiParser { public class wikiCode extends abstractWikiParser implements wikiParser {
private static final String ASTERISK = "*"; private static final String ASTERISK = "*";
private static final String EMPTY = ""; private static final String EMPTY = "";
@ -60,7 +60,7 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
private static final String HTML_OPEN_BLOCKQUOTE = "<blockquote>"; private static final String HTML_OPEN_BLOCKQUOTE = "<blockquote>";
private static final String HTML_OPEN_LIST_ELEMENT = "<li>"; private static final String HTML_OPEN_LIST_ELEMENT = "<li>";
private static final String HTML_OPEN_ORDERED_LIST = "<ol>"; private static final String HTML_OPEN_ORDERED_LIST = "<ol>";
private static final String WIKI_CLOSE_LINK = "]]"; private static final String WIKI_CLOSE_LINK = "]]";
private static final String WIKI_OPEN_LINK = "[["; private static final String WIKI_OPEN_LINK = "[[";
private static final String WIKI_CLOSE_EXTERNAL_LINK = "]"; private static final String WIKI_CLOSE_EXTERNAL_LINK = "]";
@ -70,17 +70,23 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
private static final String WIKI_EMPHASIZE_1 = "\'\'"; private static final String WIKI_EMPHASIZE_1 = "\'\'";
private static final String WIKI_EMPHASIZE_2 = "\'\'\'"; private static final String WIKI_EMPHASIZE_2 = "\'\'\'";
private static final String WIKI_EMPHASIZE_3 = "\'\'\'\'\'"; private static final String WIKI_EMPHASIZE_3 = "\'\'\'\'\'";
private static final String WIKI_HEADLINE_TAG_1 = "=="; private static final String WIKI_HEADLINE_TAG_1 = "=";
private static final String WIKI_HEADLINE_TAG_2 = "==="; private static final String WIKI_HEADLINE_TAG_2 = "==";
private static final String WIKI_HEADLINE_TAG_3 = "===="; private static final String WIKI_HEADLINE_TAG_3 = "===";
private static final String WIKI_HEADLINE_TAG_4 = "====";
private static final String WIKI_HEADLINE_TAG_5 = "=====";
private static final String WIKI_HEADLINE_TAG_6 = "======";
private static final String WIKI_HR_LINE = "----"; private static final String WIKI_HR_LINE = "----";
private static final String WIKI_IMAGE = "Image:"; private static final String WIKI_IMAGE = "Image:";
private static final String WIKI_OPEN_EXTERNAL_LINK = "["; private static final String WIKI_OPEN_EXTERNAL_LINK = "[";
private static final String WIKI_OPEN_PRE_ESCAPED = "&lt;pre&gt;"; private static final String WIKI_OPEN_PRE_ESCAPED = "&lt;pre&gt;";
private static final char ONE = '1'; private static final char ONE = '1';
private static final char THREE = '3';
private static final char TWO = '2'; private static final char TWO = '2';
private static final char THREE = '3';
private static final char FOUR = '4';
private static final char FIVE = '5';
private static final char SIX = '6';
private static final char WIKI_FORMATTED = ' '; private static final char WIKI_FORMATTED = ' ';
private static final char WIKI_INDENTION = ':'; private static final char WIKI_INDENTION = ':';
@ -101,9 +107,9 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
private final static Map<String, String[]> PROPERTY_VALUES = new HashMap<String, String[]>(); private final static Map<String, String[]> PROPERTY_VALUES = new HashMap<String, String[]>();
/** Tags for different types of headlines in wikiCode. */ /** Tags for different types of headlines in wikiCode. */
private final static String[] HEADLINE_TAGS = new String[]{WIKI_HEADLINE_TAG_3, WIKI_HEADLINE_TAG_2, WIKI_HEADLINE_TAG_1}; private final static String[] HEADLINE_TAGS = new String[]{WIKI_HEADLINE_TAG_6, WIKI_HEADLINE_TAG_5, WIKI_HEADLINE_TAG_4, WIKI_HEADLINE_TAG_3, WIKI_HEADLINE_TAG_2, WIKI_HEADLINE_TAG_1};
private final static char[] HEADLINE_LEVEL = new char[]{ONE, TWO, THREE}; private final static char[] HEADLINE_LEVEL = new char[]{ONE, TWO, THREE, FOUR, FIVE, SIX};
private String numberedListLevel = EMPTY; private String numberedListLevel = EMPTY;
private String unorderedListLevel = EMPTY; private String unorderedListLevel = EMPTY;
@ -568,7 +574,7 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
//both <pre> and </pre> in the same line //both <pre> and </pre> in the same line
if ((positionOfOpeningTag >= 0) && (positionOfClosingTag > 0) && !escaped) { if ((positionOfOpeningTag >= 0) && (positionOfClosingTag > 0) && !escaped) {
if (positionOfOpeningTag < positionOfClosingTag) { if (positionOfOpeningTag < positionOfClosingTag) {
String preformattedText = "<pre style=\"border:dotted;border-width:thin\">" + line.substring(positionOfOpeningTag + LEN_WIKI_OPEN_PRE_ESCAPED, positionOfClosingTag) + "</pre>"; String preformattedText = "<pre style=\"border:dotted;border-width:thin;\">" + line.substring(positionOfOpeningTag + LEN_WIKI_OPEN_PRE_ESCAPED, positionOfClosingTag) + "</pre>";
preformattedText = preformattedText.replaceAll("!pre!", "!pre!!"); preformattedText = preformattedText.replaceAll("!pre!", "!pre!!");
line = processLineOfWikiCode(line.substring(0, positionOfOpeningTag).replaceAll("!pre!", "!pre!!") + "!pre!txt!" + line.substring(positionOfClosingTag + LEN_WIKI_CLOSE_PRE_ESCAPED).replaceAll("!pre!", "!pre!!")); line = processLineOfWikiCode(line.substring(0, positionOfOpeningTag).replaceAll("!pre!", "!pre!!") + "!pre!txt!" + line.substring(positionOfClosingTag + LEN_WIKI_CLOSE_PRE_ESCAPED).replaceAll("!pre!", "!pre!!"));
line = line.replaceAll("!pre!txt!", preformattedText); line = line.replaceAll("!pre!txt!", preformattedText);
@ -588,10 +594,11 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
else if ((positionOfOpeningTag >= 0) && !preformattedSpanning && !escaped) { else if ((positionOfOpeningTag >= 0) && !preformattedSpanning && !escaped) {
processingPreformattedText = true; //prevent surplus line breaks processingPreformattedText = true; //prevent surplus line breaks
final StringBuilder openBlockQuoteTags = new StringBuilder(); //gets filled with <blockquote>s as needed final StringBuilder openBlockQuoteTags = new StringBuilder(); //gets filled with <blockquote>s as needed
String preformattedText = "<pre style=\"border:dotted;border-width:thin\">" + line.substring(positionOfOpeningTag + LEN_WIKI_OPEN_PRE_ESCAPED); String preformattedText = "<pre style=\"border:dotted;border-width:thin;\">" + line.substring(positionOfOpeningTag + LEN_WIKI_OPEN_PRE_ESCAPED);
preformattedText = preformattedText.replaceAll("!pre!", "!pre!!"); preformattedText = preformattedText.replaceAll("!pre!", "!pre!!");
//taking care of indented lines //taking care of indented lines
while (line.substring(preindented, positionOfOpeningTag).charAt(0) == WIKI_INDENTION) { while (preindented < positionOfOpeningTag && positionOfOpeningTag < line.length() &&
line.substring(preindented, positionOfOpeningTag).charAt(0) == WIKI_INDENTION) {
preindented++; preindented++;
openBlockQuoteTags.append(HTML_OPEN_BLOCKQUOTE); openBlockQuoteTags.append(HTML_OPEN_BLOCKQUOTE);
} }
@ -600,17 +607,17 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
line = line.replaceAll("!pre!!", "!pre!"); line = line.replaceAll("!pre!!", "!pre!");
preformattedSpanning = true; preformattedSpanning = true;
} //end </pre> } //end </pre>
else if ((positionOfOpeningTag >= 0) && preformattedSpanning && !escaped) { else if ((positionOfClosingTag >= 0) && preformattedSpanning && !escaped) {
preformattedSpanning = false; preformattedSpanning = false;
final StringBuilder endBlockQuoteTags = new StringBuilder(); //gets filled with </blockquote>s as needed final StringBuilder endBlockQuoteTags = new StringBuilder(); //gets filled with </blockquote>s as needed
String preformattedText = line.substring(0, positionOfOpeningTag) + "</pre>"; String preformattedText = line.substring(0, positionOfClosingTag) + "</pre>";
preformattedText = preformattedText.replaceAll("!pre!", "!pre!!"); preformattedText = preformattedText.replaceAll("!pre!", "!pre!!");
//taking care of indented lines //taking care of indented lines
while (preindented > 0) { while (preindented > 0) {
endBlockQuoteTags.append(HTML_CLOSE_BLOCKQUOTE); endBlockQuoteTags.append(HTML_CLOSE_BLOCKQUOTE);
preindented--; preindented--;
} }
line = processLineOfWikiCode("!pre!txt!" + line.substring(positionOfOpeningTag + LEN_WIKI_CLOSE_PRE_ESCAPED).replaceAll("!pre!", "!pre!!")); line = processLineOfWikiCode("!pre!txt!" + line.substring(positionOfClosingTag + LEN_WIKI_CLOSE_PRE_ESCAPED).replaceAll("!pre!", "!pre!!"));
line = line.replaceAll("!pre!txt!", preformattedText) + endBlockQuoteTags; line = line.replaceAll("!pre!txt!", preformattedText) + endBlockQuoteTags;
line = line.replaceAll("!pre!!", "!pre!"); line = line.replaceAll("!pre!!", "!pre!");
processingPreformattedText = false; processingPreformattedText = false;
@ -637,6 +644,9 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
int level1 = 0; int level1 = 0;
int level2 = 0; int level2 = 0;
int level3 = 0; int level3 = 0;
int level4 = 0;
int level5 = 0;
int level6 = 0;
int doubles = 0; int doubles = 0;
String anchorext = EMPTY; String anchorext = EMPTY;
if ((s = tableOfContentElements.size()) > 2) { if ((s = tableOfContentElements.size()) > 2) {
@ -673,37 +683,91 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
final char l = element.charAt(0); final char l = element.charAt(0);
String temp = ""; String temp = "";
if (Arrays.binarySearch(HEADLINE_LEVEL, l) >= 0 && element.length() > 0) { if (Arrays.binarySearch(HEADLINE_LEVEL, l) >= 0 && element.length() > 0) {
if (l == THREE) {
if (level < 3) { switch (l) {
level = 3;
level3 = 0; case SIX: {
if (level < 6) {
level = 6;
level6 = 0;
}
level6++;
temp = element.substring(1);
element = level1 + "." + level2 + "." + level3 + "." + level4 + "." + level5 + "." + level6 + " " + temp;
directory.append("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#");
break;
}
case FIVE: {
if (level == 1) {
level2 = 0;
level = 2;
}
if (level == 3) {
level = 2;
}
level5++;
temp = element.substring(1);
element = level1 + "." + level2 + "." + level3 + "." + level4 + "." + level5 + " " + temp;
directory.append("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#");
break;
}
case FOUR: {
if (level == 1) {
level2 = 0;
level = 2;
}
if (level == 3) {
level = 2;
}
level4++;
temp = element.substring(1);
element = level1 + "." + level2 + "." + level3 + "." + level4 + " " + temp;
directory.append("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#");
break;
} }
level3++; case THREE: {
temp = element.substring(1); if (level == 1) {
element = level1 + "." + level2 + "." + level3 + " " + temp; level2 = 0;
directory.append("&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#"); level = 2;
} else if (l == TWO) { }
if (level == 1) { if (level == 3) {
level2 = 0; level = 2;
level = 2; }
level3++;
temp = element.substring(1);
element = level1 + "." + level2 + "." + level3 + " " + temp;
directory.append("&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#");
break;
} }
if (level == 3) { case TWO: {
level = 2; if (level == 1) {
level2 = 0;
level = 2;
}
if (level == 3) {
level = 2;
}
level2++;
temp = element.substring(1);
element = level1 + "." + level2 + " " + temp;
directory.append("&nbsp;&nbsp;<a href=\"#");
break;
} }
level2++; case ONE: {
temp = element.substring(1); if (level > 1) {
element = level1 + "." + level2 + " " + temp; level = 1;
directory.append("&nbsp;&nbsp;<a href=\"#"); level2 = 0;
} else if (l == ONE) { level3 = 0;
if (level > 1) { level4 = 0;
level = 1; level5 = 0;
level2 = 0; level6 = 0;
level3 = 0; }
level1++;
temp = element.substring(1);
element = level1 + ". " + temp;
directory.append("<a href=\"#");
break;
} }
level1++;
temp = element.substring(1);
element = level1 + ". " + temp;
directory.append("<a href=\"#");
} }
directory.append(temp.replaceAll(" ", "_").replaceAll(REGEX_NOT_CHAR_NUM_OR_UNDERSCORE, EMPTY)); directory.append(temp.replaceAll(" ", "_").replaceAll(REGEX_NOT_CHAR_NUM_OR_UNDERSCORE, EMPTY));
@ -722,7 +786,7 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
return directory; return directory;
} }
/** Replaces two occurences of a substring in a string by a pair of strings if /** Replaces two occurences of a substring in a string by a pair of strings if
* that substring occurs twice in the string. This method is not greedy! You'll * that substring occurs twice in the string. This method is not greedy! You'll
* have to run it in a loop if you want to replace all occurences of the substring. * have to run it in a loop if you want to replace all occurences of the substring.
* This method provides special treatment for headlines. * This method provides special treatment for headlines.
@ -790,14 +854,16 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
* @return HTML fragment * @return HTML fragment
*/ */
public String processLineOfWikiCode(String line) { public String processLineOfWikiCode(String line) {
//If HTML has not bee replaced yet (can happen if method gets called in recursion), replace now! //If HTML has not been replaced yet (can happen if method gets called in recursion), replace now!
if (!replacedHtmlAlready || preformattedSpanning) { if ((!replacedHtmlAlready || preformattedSpanning) && line.indexOf(WIKI_CLOSE_PRE_ESCAPED) < 0) {
line = CharacterCoding.unicode2html(line, true); line = CharacterCoding.unicode2html(line, true);
replacedHtmlAlready = true; replacedHtmlAlready = true;
} }
//check if line contains preformatted symbols or if we are in a preformatted sequence already. //check if line contains preformatted symbols or if we are in a preformatted sequence already.
if ((line.indexOf(WIKI_OPEN_PRE_ESCAPED) >= 0) || (line.indexOf(WIKI_CLOSE_PRE_ESCAPED) >= 0) || (preformattedSpanning)) { if ((line.indexOf(WIKI_OPEN_PRE_ESCAPED) >= 0) ||
(line.indexOf(WIKI_CLOSE_PRE_ESCAPED) >= 0) ||
preformattedSpanning) {
line = processPreformattedText(line); line = processPreformattedText(line);
} else { } else {
@ -823,18 +889,21 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
} }
line = head + line + tail; line = head + line + tail;
} }
// end contrib [MN] // end contrib [MN]
// format headers // format headers
line = pairReplace(line, WIKI_HEADLINE_TAG_3, "<h4>", "</h4>"); line = pairReplace(line, WIKI_HEADLINE_TAG_6, "<h6>", "</h6>");
line = pairReplace(line, WIKI_HEADLINE_TAG_2, "<h3>", "</h3>"); line = pairReplace(line, WIKI_HEADLINE_TAG_5, "<h5>", "</h5>");
line = pairReplace(line, WIKI_HEADLINE_TAG_1, "<h2>", "</h2>"); line = pairReplace(line, WIKI_HEADLINE_TAG_4, "<h4>", "</h4>");
line = pairReplace(line, WIKI_HEADLINE_TAG_3, "<h3>", "</h3>");
line = pairReplace(line, WIKI_HEADLINE_TAG_2, "<h2>", "</h2>");
line = pairReplace(line, WIKI_HEADLINE_TAG_1, "<h1>", "</h1>");
line = pairReplace(line, WIKI_EMPHASIZE_3, "<b><i>", "</i></b>"); line = pairReplace(line, WIKI_EMPHASIZE_3, "<b><i>", "</i></b>");
line = pairReplace(line, WIKI_EMPHASIZE_2, "<b>", "</b>"); line = pairReplace(line, WIKI_EMPHASIZE_2, "<b>", "</b>");
line = pairReplace(line, WIKI_EMPHASIZE_1, "<i>", "</i>"); line = pairReplace(line, WIKI_EMPHASIZE_1, "<i>", "</i>");
line = pairReplace(line, WIKI_OPEN_STRIKE, WIKI_CLOSE_STRIKE, "<s>", "</s>"); line = pairReplace(line, WIKI_OPEN_STRIKE, WIKI_CLOSE_STRIKE, "<span class=\"strike\">", "</span>");
line = processUnorderedList(line); line = processUnorderedList(line);
line = processOrderedList(line); line = processOrderedList(line);
@ -852,4 +921,4 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
} }
return line; return line;
} }
} }
Write Preview
Loading…
Cancel
Save