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

- added Skype nick to peer profile

Browse Source 
- reversed remote/local search statistics table order (latest first)
- fixed bug in remote search tracker

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3294 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 18 years ago
parent 98cb777e18
commit 2de9d73702
7 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
htroot/ConfigProfile_p.html
Unescape View File

@ -51,6 +51,10 @@
<dd>
<input type="text" name="msn" id="msn" size="40" maxlength="1000" value="#[msn]#" />
</dd>
<dt><label for="msn">Skype</label></dt>
<dd>
<input type="text" name="skype" id="msn" size="40" maxlength="1000" value="#[skype]#" />
</dd>
</dl>
<dl>
<dt><label for="comment">Comment</label></dt>

3
htroot/ConfigProfile_p.java
Unescape View File

@ -85,6 +85,7 @@ public class ConfigProfile_p {
profile.setProperty("jabber", (String)post.get("jabber"));
profile.setProperty("yahoo", (String)post.get("yahoo"));
profile.setProperty("msn", (String)post.get("msn"));
profile.setProperty("skype", (String)post.get("skype"));
profile.setProperty("comment", (String)post.get("comment"));
@ -98,6 +99,7 @@ public class ConfigProfile_p {
prop.put("jabber", profile.getProperty("jabber", ""));
prop.put("yahoo", profile.getProperty("yahoo", ""));
prop.put("msn", profile.getProperty("msn", ""));
prop.put("skype", profile.getProperty("skype", ""));
prop.put("comment", profile.getProperty("comment", ""));
@ -128,6 +130,7 @@ public class ConfigProfile_p {
prop.put("jabber", profile.getProperty("jabber", ""));
prop.put("yahoo", profile.getProperty("yahoo", ""));
prop.put("msn", profile.getProperty("msn", ""));
prop.put("skype", profile.getProperty("skype", ""));
prop.put("comment", profile.getProperty("comment", ""));
}

2
htroot/Network.html
Unescape View File

@ -182,7 +182,7 @@
<td align="right">#[my-connects]#</td>
</tr>
</table>
<p><a href="NetworkPicture.png?width=800&amp;height=600"><img src="NetworkPicture.png" alt="The yacy Network" /></a></p>
<p><a href="NetworkPicture.png?width=768&amp;height=576"><img src="NetworkPicture.png" alt="The yacy Network" /></a></p>
<table border="0">
<tr>
<td>&nbsp;</td>

8
htroot/NetworkPicture.java
Unescape View File

@ -56,16 +56,16 @@ public class NetworkPicture {
public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
int width = 640;
int height = 480;
int width = 768;
int height = 576;
int passiveLimit = 300;
int potentialLimit = 300;
int maxCount = 1000;
boolean corona = true;
if (post != null) {
width = post.getInt("width", 640);
height = post.getInt("height", 420);
width = post.getInt("width", 768);
height = post.getInt("height", 576);
passiveLimit = post.getInt("pal", 300);
potentialLimit = post.getInt("pol", 300);
maxCount = post.getInt("max", 1000);

25
htroot/SearchStatistics_p.java
Unescape View File

@ -60,6 +60,7 @@ public class SearchStatistics_p {
Long trackerHandle;
HashMap searchProfile;
StringBuffer a = null;
int m = Math.min(maxCount, (page == 1) ? switchboard.localSearches.size(): switchboard.remoteSearches.size()) - 1;
while ((entCount < maxCount) && (i.hasNext())) {
entry = (Map.Entry) i.next();
trackerHandle = (Long) entry.getKey();
@ -72,22 +73,22 @@ public class SearchStatistics_p {
}
// put values in template
prop.put("page_list_" + entCount + "_dark", ((dark) ? 1 : 0) ); dark =! dark;
prop.put("page_list_" + entCount + "_host", (String) searchProfile.get("host"));
prop.put("page_list_" + entCount + "_date", yacyCore.universalDateShortString(new Date(trackerHandle.longValue())));
prop.put("page_list_" + (m - entCount) + "_dark", ((dark) ? 1 : 0) ); dark =! dark;
prop.put("page_list_" + (m - entCount) + "_host", (String) searchProfile.get("host"));
prop.put("page_list_" + (m - entCount) + "_date", yacyCore.universalDateShortString(new Date(trackerHandle.longValue())));
if (page == 1) {
// local search
prop.put("page_list_" + entCount + "_offset", ((Integer) searchProfile.get("offset")).toString());
prop.put("page_list_" + entCount + "_querywords", new String(a));
prop.put("page_list_" + (m - entCount) + "_offset", ((Integer) searchProfile.get("offset")).toString());
prop.put("page_list_" + (m - entCount) + "_querywords", new String(a));
} else {
// remote search
prop.put("page_list_" + entCount + "_peername", (String) searchProfile.get("peername"));
prop.put("page_list_" + entCount + "_queryhashes", plasmaSearchQuery.anonymizedQueryHashes((Set) searchProfile.get("queryhashes")));
prop.put("page_list_" + (m - entCount) + "_peername", (String) searchProfile.get("peername"));
prop.put("page_list_" + (m - entCount) + "_queryhashes", plasmaSearchQuery.anonymizedQueryHashes((Set) searchProfile.get("queryhashes")));
}
prop.put("page_list_" + entCount + "_querycount", ((Integer) searchProfile.get("querycount")).toString());
prop.put("page_list_" + entCount + "_querytime", ((Long) searchProfile.get("querytime")).toString());
prop.put("page_list_" + entCount + "_resultcount", ((Integer) searchProfile.get("resultcount")).toString());
prop.put("page_list_" + entCount + "_resulttime", ((Long) searchProfile.get("resulttime")).toString());
prop.put("page_list_" + (m - entCount) + "_querycount", ((Integer) searchProfile.get("querycount")).toString());
prop.put("page_list_" + (m - entCount) + "_querytime", ((Long) searchProfile.get("querytime")).toString());
prop.put("page_list_" + (m - entCount) + "_resultcount", ((Integer) searchProfile.get("resultcount")).toString());
prop.put("page_list_" + (m - entCount) + "_resulttime", ((Long) searchProfile.get("resulttime")).toString());
// next
entCount++;
@ -113,7 +114,7 @@ public class SearchStatistics_p {
prop.put("page_list_" + entCount + "_host", host);
if (page == 4) {
yacySeed remotepeer = yacyCore.seedDB.lookupByIP(natLib.getInetAddress(host), true, true, true);
prop.put("page_list_" + entCount + "_peername", remotepeer);
prop.put("page_list_" + entCount + "_peername", remotepeer.getName());
}
prop.put("page_list_" + entCount + "_count", new Integer(handles.size()).toString());
prop.put("page_list_" + entCount + "_dates", handlestring);

2
htroot/ViewProfile.html
Unescape View File

@ -45,6 +45,8 @@
<dd>#(yahoo)#&nbsp;::#[value]##(/yahoo)#</dd>
<dt>MSN</dt>
<dd>#(msn)#&nbsp;::#[value]##(/msn)#</dd>
<dt>Skype</dt>
<dd>#(skype)#&nbsp;::#[value]##(/skype)#</dd>
</dl>
<dl class="pairs">

1
htroot/ViewProfile.java
Unescape View File

@ -149,6 +149,7 @@ public class ViewProfile {
knownKeys.add("jabber");
knownKeys.add("yahoo");
knownKeys.add("msn");
knownKeys.add("skype");
knownKeys.add("comment");
//empty values

Write Preview
Loading…
Cancel
Save