diff --git a/htroot/WatchCrawler.html b/htroot/WatchCrawler.html
new file mode 100644
index 000000000..5ffbdedc8
--- /dev/null
+++ b/htroot/WatchCrawler.html
@@ -0,0 +1,29 @@
+
+
+
+YaCy '#[clientname]#': Watch Crawler
+#[metas]#
+
+
+
+
+#[header]#
+
+Watch Crawler
+
+Indexing Queue:
+
+
+#[footer]#
+
+
diff --git a/htroot/js/WatchCrawler.js b/htroot/js/WatchCrawler.js
new file mode 100644
index 000000000..7fd92de1c
--- /dev/null
+++ b/htroot/js/WatchCrawler.js
@@ -0,0 +1,26 @@
+function handleResponse(){
+ if(http.readyState == 4){
+ var response = http.responseXML;
+ indexingTable=document.getElementById("indexingTable");
+ entries=response.getElementsByTagName("entry");
+ for(i=0;i 0)) {
+ entryList.addAll(switchboard.sbQueue.list(0));
+ }
+
+ for (i = 0; i < entryList.size(); i++) {
+ boolean inProcess = i < inProcessCount;
+ pcentry = (plasmaSwitchboardQueue.Entry) entryList.get(i);
+ long entrySize = pcentry.size();
+ totalSize += entrySize;
+ if ((pcentry != null)&&(pcentry.url() != null)) {
+ initiator = yacyCore.seedDB.getConnected(pcentry.initiator());
+ prop.put("list_"+i+"_initiator", ((initiator == null) ? "proxy" : wikiTransformer.replaceHTML(initiator.getName())));
+ prop.put("list_"+i+"_depth", pcentry.depth());
+ prop.put("list_"+i+"_modified", (pcentry.responseHeader() == null) ? "" : daydate(pcentry.responseHeader().lastModified()));
+ prop.put("list_"+i+"_anchor", (pcentry.anchorName()==null)?"":wikiTransformer.replaceHTML(pcentry.anchorName()));
+ prop.put("list_"+i+"_url", wikiTransformer.replaceHTML(pcentry.normalizedURLString()));
+ prop.put("list_"+i+"_size", entrySize);
+ prop.put("list_"+i+"_inProcess", (inProcess)?1:0);
+ prop.put("list_"+i+"_hash", pcentry.urlHash());
+ }
+ }
+ prop.put("list", i);
+ } catch (IOException e) {}
+ }
+
+ // return rewrite properties
+ return prop;
+ }
+
+}
+
+
+
diff --git a/htroot/xml/queues/indexing_p.xml b/htroot/xml/queues/indexing_p.xml
new file mode 100644
index 000000000..4cff88392
--- /dev/null
+++ b/htroot/xml/queues/indexing_p.xml
@@ -0,0 +1,16 @@
+
+
+#{list}#
+
+ #[initiator]#
+ #[depth]#
+ #[modified]#
+ #[anchor]#
+ #[url]#
+ #[size]#
+ #[hash]#
+ #(inProcess)#false::true#(/inProcess)#
+
+#{/list}#
+
+
diff --git a/source/de/anomic/data/wikiCode.java b/source/de/anomic/data/wikiCode.java
index 26d026108..3399de14f 100644
--- a/source/de/anomic/data/wikiCode.java
+++ b/source/de/anomic/data/wikiCode.java
@@ -111,6 +111,7 @@ public class wikiCode {
// avoide html inside
//p0 = 0; while ((p0 = result.indexOf("&", p0)) >= 0) result = result.substring(0, p0) + "&" + result.substring(p0 + 1);
p0 = 0; while ((p0 = result.indexOf('"', p0)) >= 0) result = result.substring(0, p0) + """ + result.substring(p0 + 1);
+ p0 = 0; while ((p0 = result.indexOf('&', p0)) >= 0) result = result.substring(0, p0) + "&" + result.substring(p0 + 1);
p0 = 0; while ((p0 = result.indexOf("<", p0)) >= 0) result = result.substring(0, p0) + "<" + result.substring(p0 + 1);
p0 = 0; while ((p0 = result.indexOf(">", p0)) >= 0) result = result.substring(0, p0) + ">" + result.substring(p0 + 1);
//p0 = 0; while ((p0 = result.indexOf("*", p0)) >= 0) result = result.substring(0, p0) + "" + result.substring(p0 + 1);