boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

- fixed problem when surftip url is broken

Browse Source 
- 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
pull/1/head
orbiter 18 years ago
parent 0cb1adaed6
commit 4fb86b02e4
3 changed files with 88 additions and 65 deletions
Show Stats Download Patch File Download Diff File

123
htroot/Network.html
Unescape View File

@ -3,6 +3,11 @@
<head> <head>
<title>YaCy '#[clientname]#': Network Overview</title> <title>YaCy '#[clientname]#': Network Overview</title>
#%env/templates/metas.template%# #%env/templates/metas.template%#
<style type="text/css">
#left {
float: left;
}
</style>
</head> </head>
<body id="Network"> <body id="Network">
#%env/templates/header.template%# #%env/templates/header.template%#
@ -120,7 +125,7 @@
</div> </div>
#(/progressbar)# #(/progressbar)#
:: ::
<p>All Peers:</p> <div id="left">
<table border="0" cellpadding="2" cellspacing="1"> <table border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader"> <tr class="TableHeader">
<td>Branch</td> <td>Branch</td>
@ -153,13 +158,74 @@
<td align="right">#[all-words]#</td> <td align="right">#[all-words]#</td>
</tr> </tr>
</table> </table>
<p> </div>
YaCy Cluster <div id="left">
<ul> <ul>
<li>Indexing Speed: #[gppm]# Pages Per Minute (PPM)</li> <li>Indexing Speed: #[gppm]# Pages Per Minute (PPM)</li>
<li>Query Frequency: #[gqph]# Queries Per Hour (QPH)</li> <li>Query Frequency: #[gqph]# Queries Per Hour (QPH)</li>
</ul> </ul>
</p> </div>
<div id="left">
#(comment)#
::
<ul><li>
You are in online mode, but probably no internet resource is available.
Please check your internet connection.
</li></ul>
::
<ul><li>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 <a href="http://www.yacy.net/yacy/Installation.html#wininst">here</a>
for an installation guide) or you can go online by activating the permanent online mode.
To do this, press this button:</p>
<form action="SettingsAck_p.html" method="get">
<fieldset>
<input type="submit" name="pmode" value="go online" />
</fieldset>
</form>
</li></ul>
#(/comment)#
</div>
<div id="left">
<a href="NetworkPicture.png?width=768&amp;height=576"><img src="NetworkPicture.png" alt="The yacy Network" /></a>
</div>
<div id="left">
<table border="0">
<tr>
<td>&nbsp;</td>
<td><strong>Network legend:</strong></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="background-color:#000000">&nbsp;</td>
<td>dark font</td>
<td>:</td>
<td>senior/principal peers</td>
</tr>
<tr>
<td style="background-color:#E7B7AF">&nbsp;</td>
<td>lightred font</td>
<td>:</td>
<td>passiv peers ( &lt; 5 hour passiv time)</td>
</tr>
<tr>
<td style="background-color:#A7A75F">&nbsp;</td>
<td>turquoise font</td>
<td>:</td>
<td>junior peers</td>
</tr>
<tr>
<td style="background-color:#C1A77F">&nbsp;</td>
<td>red point</td>
<td>:</td>
<td>this peer</td>
</tr>
</table>
</div>
<div id="left">
<p>Your Peer:</p> <p>Your Peer:</p>
<table border="0" cellpadding="2" cellspacing="1"> <table border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader"> <tr class="TableHeader">
@ -201,55 +267,8 @@
<td align="right">#[my-connects]#</td> <td align="right">#[my-connects]#</td>
</tr> </tr>
</table> </table>
<p><a href="NetworkPicture.png?width=768&amp;height=576"><img src="NetworkPicture.png" alt="The yacy Network" /></a></p> </div>
<table border="0">
<tr>
<td>&nbsp;</td>
<td><strong>Network legend:</strong></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="background-color:#000000">&nbsp;</td>
<td>dark font</td>
<td>:</td>
<td>senior/principal peers</td>
</tr>
<tr>
<td style="background-color:#E7B7AF">&nbsp;</td>
<td>lightred font</td>
<td>:</td>
<td>passiv peers ( &lt; 5 hour passiv time)</td>
</tr>
<tr>
<td style="background-color:#A7A75F">&nbsp;</td>
<td>turquoise font</td>
<td>:</td>
<td>junior peers</td>
</tr>
<tr>
<td style="background-color:#C1A77F">&nbsp;</td>
<td>red point</td>
<td>:</td>
<td>this peer</td>
</tr>
</table>
#(comment)#
::
<p>You are in online mode, but probably no internet resource is available. Please check your internet connection.</p>
::
<p>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 <a href="http://www.yacy.net/yacy/Installation.html#wininst">here</a>
for an installation guide) or you can go online by activating the permanent online mode.
To do this, press this button:</p>
<form action="SettingsAck_p.html" method="get">
<fieldset>
<input type="submit" name="pmode" value="go online" />
</fieldset>
</form>
#(/comment)#
:: ::
#(comment)# #(comment)#
:: ::

6
htroot/Surftips.java
Unescape View File

@ -224,6 +224,7 @@ public class Surftips {
if (record.category().equals(yacyNewsPool.CATEGORY_CRAWL_START)) { if (record.category().equals(yacyNewsPool.CATEGORY_CRAWL_START)) {
String intention = record.attribute("intention", ""); String intention = record.attribute("intention", "");
url = record.attribute("startURL", ""); url = record.attribute("startURL", "");
if (url.length() < 12) continue;
entry = rowdef.newEntry(new byte[][]{ entry = rowdef.newEntry(new byte[][]{
url.getBytes(), url.getBytes(),
((intention.length() == 0) ? record.attribute("startURL", "") : intention).getBytes(), ((intention.length() == 0) ? record.attribute("startURL", "") : intention).getBytes(),
@ -235,7 +236,7 @@ public class Surftips {
if (record.category().equals(yacyNewsPool.CATEGORY_PROFILE_UPDATE)) { if (record.category().equals(yacyNewsPool.CATEGORY_PROFILE_UPDATE)) {
url = record.attribute("homepage", ""); url = record.attribute("homepage", "");
if ((url == null) || (url.length() < 12)) continue; if (url.length() < 12) continue;
entry = rowdef.newEntry(new byte[][]{ entry = rowdef.newEntry(new byte[][]{
url.getBytes(), url.getBytes(),
("Home Page of " + record.attribute("nickname", "")).getBytes("UTF-8"), ("Home Page of " + record.attribute("nickname", "")).getBytes("UTF-8"),
@ -247,6 +248,7 @@ public class Surftips {
if (record.category().equals(yacyNewsPool.CATEGORY_BOOKMARK_ADD)) { if (record.category().equals(yacyNewsPool.CATEGORY_BOOKMARK_ADD)) {
url = record.attribute("url", ""); url = record.attribute("url", "");
if (url.length() < 12) continue;
entry = rowdef.newEntry(new byte[][]{ entry = rowdef.newEntry(new byte[][]{
url.getBytes(), url.getBytes(),
(record.attribute("title", "")).getBytes("UTF-8"), (record.attribute("title", "")).getBytes("UTF-8"),
@ -258,6 +260,7 @@ public class Surftips {
if (record.category().equals(yacyNewsPool.CATEGORY_SURFTIPP_ADD)) { if (record.category().equals(yacyNewsPool.CATEGORY_SURFTIPP_ADD)) {
url = record.attribute("url", ""); url = record.attribute("url", "");
if (url.length() < 12) continue;
entry = rowdef.newEntry(new byte[][]{ entry = rowdef.newEntry(new byte[][]{
url.getBytes(), url.getBytes(),
(record.attribute("title", "")).getBytes("UTF-8"), (record.attribute("title", "")).getBytes("UTF-8"),
@ -270,6 +273,7 @@ public class Surftips {
if (record.category().equals(yacyNewsPool.CATEGORY_SURFTIPP_VOTE_ADD)) { if (record.category().equals(yacyNewsPool.CATEGORY_SURFTIPP_VOTE_ADD)) {
if (!(record.attribute("vote", "negative").equals("positive"))) continue; if (!(record.attribute("vote", "negative").equals("positive"))) continue;
url = record.attribute("url", ""); url = record.attribute("url", "");
if (url.length() < 12) continue;
entry = rowdef.newEntry(new byte[][]{ entry = rowdef.newEntry(new byte[][]{
url.getBytes(), url.getBytes(),
record.attribute("title", "").getBytes("UTF-8"), record.attribute("title", "").getBytes("UTF-8"),

24
htroot/env/templates/header.template vendored
Unescape View File

@ -3,7 +3,7 @@
</div> </div>
<ul id="menu"> <ul id="menu">
<li class="menugroup" id="menugroupGlobalIndex"> <li class="menugroup" id="menugroupGlobalIndex">
<h3>Global Index</h3> <h3>Search&nbsp;&amp;&nbsp;Browse</h3>
<ul class="menu"> <ul class="menu">
<li><a href="/index.html?display=1" accesskey="s" class="MenuItemLink">Search Page</a></li> <li><a href="/index.html?display=1" accesskey="s" class="MenuItemLink">Search Page</a></li>
<li><a href="/DetailedSearch.html" class="MenuItemLink">Detailed Search</a></li> <li><a href="/DetailedSearch.html" class="MenuItemLink">Detailed Search</a></li>
@ -12,20 +12,11 @@
<li><a href="/Help.html" class="MenuItemLink">Help</a></li> <li><a href="/Help.html" class="MenuItemLink">Help</a></li>
</ul> </ul>
</li> </li>
<li class="menugroup" id="menugroupCrawlerControl">
<h3>Web Crawler</h3>
<ul class="menu">
<li><a href="/IndexCreate_p.html" class="MenuItemLink lock">Start Web Crawl</a></li>
<li><a href="/IndexControl_p.html" class="MenuItemLink lock">Administrate Index</a></li>
<li><a href="/Blacklist_p.html" class="MenuItemLink lock">URL Blacklist</a></li>
<li><a href="/ProxyIndexingMonitor_p.html" class="MenuItemLink lock">Indexing with Proxy</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupMonitoring"> <li class="menugroup" id="menugroupMonitoring">
<h3>Monitoring</h3> <h3>Monitoring</h3>
<ul class="menu"> <ul class="menu">
<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li> <li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>
<li><a href="/WatchCrawler_p.html" class="MenuItemLink lock">Crawl Activity</a></li> <li><a href="/WatchWebStructure_p.html?host=auto&depth=2" class="MenuItemLink lock">Crawl Activity</a></li>
<li><a href="/IndexMonitor.html" class="MenuItemLink">Crawl Results</a></li> <li><a href="/IndexMonitor.html" class="MenuItemLink">Crawl Results</a></li>
<li><a href="/SearchStatistics_p.html" class="MenuItemLink lock">Search Statistics</a></li> <li><a href="/SearchStatistics_p.html" class="MenuItemLink lock">Search Statistics</a></li>
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li> <li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
@ -35,8 +26,17 @@
<li><a href="/CookieMonitorIncoming_p.html" class="MenuItemLink lock">Cookies in Proxy</a></li> <li><a href="/CookieMonitorIncoming_p.html" class="MenuItemLink lock">Cookies in Proxy</a></li>
</ul> </ul>
</li> </li>
<li class="menugroup" id="menugroupCrawlerControl">
<h3>Your&nbsp;Web&nbsp;Index</h3>
<ul class="menu">
<li><a href="/IndexCreate_p.html" class="MenuItemLink lock">Start a Web Crawl</a></li>
<li><a href="/IndexControl_p.html" class="MenuItemLink lock">Moderate own Index</a></li>
<li><a href="/Blacklist_p.html" class="MenuItemLink lock">Filter &amp; Blacklist</a></li>
<li><a href="/ProxyIndexingMonitor_p.html" class="MenuItemLink lock">Indexing with Proxy</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupCommunicationPublication"> <li class="menugroup" id="menugroupCommunicationPublication">
<h3>Your Web</h3> <h3>Your Web Content</h3>
<ul class="menu"> <ul class="menu">
<li><a href="/Wiki.html?display=1" class="MenuItemLink">YaCy Wiki</a></li> <li><a href="/Wiki.html?display=1" class="MenuItemLink">YaCy Wiki</a></li>
<li><a href="/Blog.html?display=1" class="MenuItemLink">YaCy Blog</a></li> <li><a href="/Blog.html?display=1" class="MenuItemLink">YaCy Blog</a></li>

Write Preview
Loading…
Cancel
Save