From 4fb86b02e4161ca4e089014df8b11a6dc6746488 Mon Sep 17 00:00:00 2001 From: orbiter Date: Wed, 6 Jun 2007 18:24:35 +0000 Subject: [PATCH] - fixed problem when surftip url is broken - more renaming of menu entrie - redesigned network page: moved grafic more to top - changed default link to index monitor: now it points to the web structure picture git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3808 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/Network.html | 123 ++++++++++++++++----------- htroot/Surftips.java | 6 +- htroot/env/templates/header.template | 24 +++--- 3 files changed, 88 insertions(+), 65 deletions(-) diff --git a/htroot/Network.html b/htroot/Network.html index 03452deea..d1f6df506 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -3,6 +3,11 @@ YaCy '#[clientname]#': Network Overview #%env/templates/metas.template%# + #%env/templates/header.template%# @@ -120,7 +125,7 @@ #(/progressbar)# :: -

All Peers:

+
@@ -153,13 +158,74 @@
Branch#[all-words]#
-

- YaCy Cluster +

+
-

+
+ +
+ #(comment)# + :: + + :: + + #(/comment)# +
+ +
+ The yacy Network +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Network legend:
 dark font:senior/principal peers
 lightred font:passiv peers ( < 5 hour passiv time)
 turquoise font:junior peers
 red point:this peer
+
+

Your Peer:

@@ -201,55 +267,8 @@
#[my-connects]#
-

The yacy Network

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Network legend:
 dark font:senior/principal peers
 lightred font:passiv peers ( < 5 hour passiv time)
 turquoise font:junior peers
 red point:this peer
+
- #(comment)# - :: -

You are in online mode, but probably no internet resource is available. Please check your internet connection.

- :: -

You are either not in online mode or you do not use the proxy option. - To get connection to the YaCy network, you must use the proxy by setting your browser's settings - ('on-demand - mode', see here - for an installation guide) or you can go online by activating the permanent online mode. - To do this, press this button:

-
-
- -
-
- #(/comment)# :: #(comment)# :: diff --git a/htroot/Surftips.java b/htroot/Surftips.java index ed87a08ee..d9934f468 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -224,6 +224,7 @@ public class Surftips { if (record.category().equals(yacyNewsPool.CATEGORY_CRAWL_START)) { String intention = record.attribute("intention", ""); url = record.attribute("startURL", ""); + if (url.length() < 12) continue; entry = rowdef.newEntry(new byte[][]{ url.getBytes(), ((intention.length() == 0) ? record.attribute("startURL", "") : intention).getBytes(), @@ -235,7 +236,7 @@ public class Surftips { if (record.category().equals(yacyNewsPool.CATEGORY_PROFILE_UPDATE)) { url = record.attribute("homepage", ""); - if ((url == null) || (url.length() < 12)) continue; + if (url.length() < 12) continue; entry = rowdef.newEntry(new byte[][]{ url.getBytes(), ("Home Page of " + record.attribute("nickname", "")).getBytes("UTF-8"), @@ -247,6 +248,7 @@ public class Surftips { if (record.category().equals(yacyNewsPool.CATEGORY_BOOKMARK_ADD)) { url = record.attribute("url", ""); + if (url.length() < 12) continue; entry = rowdef.newEntry(new byte[][]{ url.getBytes(), (record.attribute("title", "")).getBytes("UTF-8"), @@ -258,6 +260,7 @@ public class Surftips { if (record.category().equals(yacyNewsPool.CATEGORY_SURFTIPP_ADD)) { url = record.attribute("url", ""); + if (url.length() < 12) continue; entry = rowdef.newEntry(new byte[][]{ url.getBytes(), (record.attribute("title", "")).getBytes("UTF-8"), @@ -270,6 +273,7 @@ public class Surftips { if (record.category().equals(yacyNewsPool.CATEGORY_SURFTIPP_VOTE_ADD)) { if (!(record.attribute("vote", "negative").equals("positive"))) continue; url = record.attribute("url", ""); + if (url.length() < 12) continue; entry = rowdef.newEntry(new byte[][]{ url.getBytes(), record.attribute("title", "").getBytes("UTF-8"), diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 9ade78b87..b1769816b 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -3,7 +3,7 @@