summaryrefslogtreecommitdiff
path: root/htroot
diff options
context:
space:
mode:
authororbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>2008-04-28 20:34:37 +0000
committerorbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>2008-04-28 20:34:37 +0000
commit5813cc149fb147fa69f9879b598a95ed2fb78764 (patch)
tree0db7ee04bf923f5ded994ae8778683251d0cbdfa /htroot
parent88216c1f1f5adb1cb266eb512ed586c13ae51fff (diff)
fix for bad rssTerminal behavior
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4744 6c8d7289-2bf4-0310-a012-ef5d649a1542
Diffstat (limited to 'htroot')
-rw-r--r--htroot/Status.html2
-rwxr-xr-xhtroot/rssTerminal.html18
-rwxr-xr-xhtroot/xml/feed.java2
3 files changed, 14 insertions, 8 deletions
diff --git a/htroot/Status.html b/htroot/Status.html
index 1db96bbc4..d9d9c1335 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -24,7 +24,7 @@
<div class="welcome">
<center>
<h2>Welcome to YaCy!</h2><br />
- <iframe src="rssTerminal.html?set=PEERNEWS&width=468px&height=200px&maxlines=20&maxwidth=90"
+ <iframe src="rssTerminal.html?set=PEERNEWS&width=468px&height=200px&maxlines=20&maxwidth=95"
width="482" height="220" scrolling="no" name="newsframe"
marginheight="0" marginwidth="0" frameborder="0"></iframe><br />
<img src="Banner.png?textcolor=000000&amp;bgcolor=ddeeee&amp;bordercolor=aaaaaa" alt="banner" />
diff --git a/htroot/rssTerminal.html b/htroot/rssTerminal.html
index 05038a13d..f8ccc4fb8 100755
--- a/htroot/rssTerminal.html
+++ b/htroot/rssTerminal.html
@@ -36,11 +36,14 @@ var idleping = null;
var loader = null;
var lastwait = 1000;
var tab = "&nbsp;&nbsp;";
+var lastShow = new Date();
function fillLines() {
+alert(maxlines);
for (var i = 0; i < maxlines + 1; i++) {
- //addLine(i + "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
- addLine("");
+ alert(maxlines);http://localhost:8080/Steering.html?shutdown=
+ addLine(i + "-123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789-");
+ //addLine("");
}
}
@@ -61,11 +64,14 @@ function addLine(line) {
}
function show() {
+ now = new Date();
+ if (now.getTime() - lastShow.getTime() < 50) return;
var doc = document.getElementById("content");
doc.innerHTML = "";
for (var i = 0; i < maxlines; i++) {
- doc.innerHTML += lines[i] + "<br />";
+ if (lines[i]) doc.innerHTML += lines[i] + "<br />";
}
+ lastShow = new Date();
}
function newwait() {
@@ -120,12 +126,12 @@ function idlepingExec() {
}
function loaderInit() {
- loader=window.setInterval("load()", 8000);
+ loader=window.setInterval("load()", 6000);
load();
}
function load() {
- getRSS("http://localhost:8080/xml/feed.rss?set=PEERNEWS");
+ getRSS("/xml/feed.rss?set=PEERNEWS&count=50");
}
function windowsizing() {
@@ -145,7 +151,7 @@ function windowsizing() {
</script>
</head>
-<body onload="self.getURLparameters();windowsizing();fillLines();idlepingInit();loaderInit();">
+<body onload="self.getURLparameters();windowsizing();idlepingInit();loaderInit();">
<div id="feedbox">
<p id="content"></p>
</div>
diff --git a/htroot/xml/feed.java b/htroot/xml/feed.java
index b96cd7a19..90a88d656 100755
--- a/htroot/xml/feed.java
+++ b/htroot/xml/feed.java
@@ -52,7 +52,7 @@ public class feed {
RSSFeed feed = RSSFeed.channels(channelName);
if ((feed == null) || (feed.size() == 0)) return prop;
- int count = post.getInt("count", 10);
+ int count = post.getInt("count", 100);
RSSMessage message = feed.getChannel();
if (message != null) {