diff --git a/htroot/IndexCreate_p.java b/htroot/IndexCreate_p.java index 3ff278828..2ad4616bb 100644 --- a/htroot/IndexCreate_p.java +++ b/htroot/IndexCreate_p.java @@ -46,7 +46,6 @@ import java.io.IOException; import java.util.Enumeration; -import de.anomic.data.wikiCode; import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaURL; import de.anomic.plasma.plasmaSwitchboard; @@ -129,7 +128,7 @@ public class IndexCreate_p { prop.put("crawlingSpeedMaxChecked", (LCppm >= 1000) ? 1 : 0); prop.put("crawlingSpeedCustChecked", ((LCppm > 10) && (LCppm < 1000)) ? 1 : 0); prop.put("crawlingSpeedMinChecked", (LCppm <= 10) ? 1 : 0); - prop.put("customPPMdefault", ((LCppm > 10) && (LCppm < 1000)) ? Integer.toString(LCppm) : ""); + prop.put("customPPMdefault", ((LCppm > 10) && (LCppm < 1000)) ? Integer.toString(LCppm) : ""); prop.put("xsstopwChecked", env.getConfig("xsstopw", "").equals("true") ? 1 : 0); prop.put("xdstopwChecked", env.getConfig("xdstopw", "").equals("true") ? 1 : 0); @@ -162,9 +161,9 @@ public class IndexCreate_p { if (peer == null) peername = record.originator(); else peername = peer.getName(); prop.put("otherCrawlStartInProgress_" + showedCrawl + "_dark", ((dark) ? 1 : 0)); prop.put("otherCrawlStartInProgress_" + showedCrawl + "_cre", record.created()); - prop.put("otherCrawlStartInProgress_" + showedCrawl + "_peername", wikiCode.replaceHTML(peername)); - prop.put("otherCrawlStartInProgress_" + showedCrawl + "_startURL", wikiCode.replaceHTML(record.attributes().get("startURL").toString())); - prop.put("otherCrawlStartInProgress_" + showedCrawl + "_intention", wikiCode.replaceHTML(record.attributes().get("intention").toString())); + prop.put("otherCrawlStartInProgress_" + showedCrawl + "_peername", peername); + prop.put("otherCrawlStartInProgress_" + showedCrawl + "_startURL", record.attributes().get("startURL").toString()); + prop.put("otherCrawlStartInProgress_" + showedCrawl + "_intention", record.attributes().get("intention").toString()); prop.put("otherCrawlStartInProgress_" + showedCrawl + "_generalDepth", record.attributes().get("generalDepth")); prop.put("otherCrawlStartInProgress_" + showedCrawl + "_crawlingQ", (record.attributes().get("crawlingQ").equals("true")) ? 1 : 0); showedCrawl++; @@ -187,9 +186,9 @@ public class IndexCreate_p { if (peer == null) peername = record.originator(); else peername = peer.getName(); prop.put("otherCrawlStartFinished_" + showedCrawl + "_dark", ((dark) ? 1 : 0)); prop.put("otherCrawlStartFinished_" + showedCrawl + "_cre", record.created()); - prop.put("otherCrawlStartFinished_" + showedCrawl + "_peername", wikiCode.replaceHTML(peername)); - prop.put("otherCrawlStartFinished_" + showedCrawl + "_startURL", wikiCode.replaceHTML(record.attributes().get("startURL").toString())); - prop.put("otherCrawlStartFinished_" + showedCrawl + "_intention", wikiCode.replaceHTML(record.attributes().get("intention").toString())); + prop.put("otherCrawlStartFinished_" + showedCrawl + "_peername", peername); + prop.put("otherCrawlStartFinished_" + showedCrawl + "_startURL", record.attributes().get("startURL").toString()); + prop.put("otherCrawlStartFinished_" + showedCrawl + "_intention", record.attributes().get("intention").toString()); prop.put("otherCrawlStartFinished_" + showedCrawl + "_generalDepth", record.attributes().get("generalDepth")); prop.put("otherCrawlStartFinished_" + showedCrawl + "_crawlingQ", (record.attributes().get("crawlingQ").equals("true")) ? 1 : 0); showedCrawl++; diff --git a/htroot/WatchCrawler_p.java b/htroot/WatchCrawler_p.java index 416ccf966..f65757403 100644 --- a/htroot/WatchCrawler_p.java +++ b/htroot/WatchCrawler_p.java @@ -36,7 +36,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import de.anomic.data.SitemapParser; -import de.anomic.data.wikiCode; import de.anomic.htmlFilter.htmlFilterContentScraper; import de.anomic.htmlFilter.htmlFilterWriter; import de.anomic.http.httpHeader; @@ -223,7 +222,7 @@ public class WatchCrawler_p { } else { prop.put("info", 5); //Crawling failed - prop.put("info_crawlingURL", wikiCode.replaceHTML(((String) post.get("crawlingURL")))); + prop.put("info_crawlingURL", ((String) post.get("crawlingURL"))); prop.put("info_reasonString", reasonString); plasmaCrawlZURL.Entry ee = switchboard.errorURL.newEntry(crawlingStartURL, reasonString);