using Wikicode instream of bbCode

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@504 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
allo 2005-08-07 17:56:44 +00:00
parent 09193023fe
commit 53dcbadfbf
5 changed files with 21 additions and 12 deletions

View File

@ -56,7 +56,7 @@ import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverFileUtils;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
import de.anomic.tools.bbCode;
import de.anomic.data.wikiCode;
public class Messages_p {
@ -69,7 +69,7 @@ public class Messages_p {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
serverObjects prop = new serverObjects();
bbCode bb = new bbCode();
wikiCode wikiTransformer = new wikiCode(switchboard);
String action = ((post == null) ? "list" : post.get("action", "list"));
String messages = "";
@ -102,7 +102,7 @@ public class Messages_p {
messages += "<td>" + dateString(message.date()) + "</td>";
messages += "<td>" + message.author() + "</td>";
messages += "<td>" + message.recipient() + "</td>";
messages += "<td>" + bb.bb(message.subject()) + "</td>";
messages += "<td>" + wikiTransformer.transform(message.subject()) + "</td>";
messages += "<td>" +
"<a href=\"Messages_p.html?action=view&object=" + key + "\">view</a>&nbsp;/&nbsp;" +
"<a href=\"MessageSend_p.html?hash=" + message.authorHash() + "&subject=Re: " + message.subject() + "\">reply</a>&nbsp;/&nbsp;" +
@ -123,8 +123,8 @@ public class Messages_p {
messages += "<tr><td class=\"MenuHeader\">From:</td><td class=\"MessageBackground\">" + message.author() + "</td></tr>";
messages += "<tr><td class=\"MenuHeader\">To:</td><td class=\"MessageBackground\">" + message.recipient() + "</td></tr>";
messages += "<tr><td class=\"MenuHeader\">Send Date:</td><td class=\"MessageBackground\">" + dateString(message.date()) + "</td></tr>";
messages += "<tr><td class=\"MenuHeader\">Subject:</td><td class=\"MessageBackground\">" + bb.bb(message.subject()) + "</td></tr>";
messages += "<tr><td class=\"MessageBackground\" colspan=\"2\">" + bb.bb(new String(message.message())) + "</td></tr>";
messages += "<tr><td class=\"MenuHeader\">Subject:</td><td class=\"MessageBackground\">" + wikiTransformer.transform(message.subject()) + "</td></tr>";
messages += "<tr><td class=\"MessageBackground\" colspan=\"2\">" + wikiTransformer.transform(new String(message.message())) + "</td></tr>";
messages += "<tr><td class=\"MenuHeader\">Action:</td>" +
"<td class=\"MessageBackground\">" +
"<a href=\"Messages_p.html\">inbox</a>&nbsp;/&nbsp;" +

View File

@ -62,7 +62,7 @@ The peer #[peername]# is not online.
<tr>
<td>Comment</td>
<td><textarea name="comment" cols="40" rows="10" readonly>#(comment)#::#[value]##(/comment)#</textarea></td>
<td>#(comment)#&nbsp;::#[value]##(/comment)#</td>
</tr>
#{other}#
<tr>

View File

@ -60,7 +60,7 @@ import de.anomic.yacy.yacyCore;
import de.anomic.yacy.yacySeed;
import de.anomic.yacy.yacyNewsPool;
import de.anomic.yacy.yacyNewsRecord;
import de.anomic.tools.bbCode;
import de.anomic.data.wikiCode;
public class ViewProfile {
@ -68,7 +68,7 @@ public class ViewProfile {
//listManager.switchboard = (plasmaSwitchboard) env;
serverObjects prop = new serverObjects();
plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
bbCode bb = new bbCode();
wikiCode wikiTransformer = new wikiCode(switchboard);
if ((post != null) && (post.containsKey("hash")) && (yacyCore.seedDB != null)) { //no nullpointer error..
yacySeed seed = yacyCore.seedDB.getConnected((String)post.get("hash"));
@ -116,7 +116,7 @@ public class ViewProfile {
while (i.hasNext()) {
entry = (Map.Entry) i.next();
String key=(String)entry.getKey();
String value=bb.bb( ((String)entry.getValue()).replaceAll("\r","").replaceAll("\\\\n","\n") );
String value=wikiTransformer.transform( ((String)entry.getValue()).replaceAll("\r","").replaceAll("\\\\n","\n") );
//all known Keys which should be set as they are
if(knownKeys.contains(key)){
prop.put("success_"+key, 1);

View File

@ -160,7 +160,7 @@ public class Wiki {
"<input type=\"button\" name=\"demo\" value=\"Start Page\" onClick=\"self.location.href='Wiki.html'\">" +
"</form>");
} else {
wikiCode wikiTransformer=new wikiCode();
wikiCode wikiTransformer=new wikiCode(switchboard);
// show page
prop.put("pagecontent",
"<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">" +
@ -169,7 +169,7 @@ public class Wiki {
"</b></font></td></tr>" +
"<tr class=\"WikiBackground\"><td>" +
"<table width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\"><tr><td>" +
wikiTransformer.transform(page.page(), switchboard) +
wikiTransformer.transform(page.page()) +
"</td></tr></table>" +
"</td></tr></table>");

View File

@ -66,7 +66,16 @@ import de.anomic.yacy.yacyCore;
public class wikiCode {
private String numListLevel="";
private String ListLevel="";
public wikiCode(){
private plasmaSwitchboard sb;
public wikiCode(plasmaSwitchboard switchboard){
sb=switchboard;
}
public String transform(String content){
return transform(content.getBytes(), sb);
}
public String transform(byte[] content){
return transform(content, sb);
}
public String transform(byte[] content, plasmaSwitchboard switchboard) {