diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html index 6d906a43b..7c70abc3d 100644 --- a/htroot/ConfigProfile_p.html +++ b/htroot/ConfigProfile_p.html @@ -51,6 +51,10 @@
diff --git a/htroot/NetworkPicture.java b/htroot/NetworkPicture.java index 5fc1f983f..ebb64ab73 100644 --- a/htroot/NetworkPicture.java +++ b/htroot/NetworkPicture.java @@ -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); diff --git a/htroot/SearchStatistics_p.java b/htroot/SearchStatistics_p.java index 3e467b2ac..c16c5db88 100644 --- a/htroot/SearchStatistics_p.java +++ b/htroot/SearchStatistics_p.java @@ -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); diff --git a/htroot/ViewProfile.html b/htroot/ViewProfile.html index 11f669717..9be76ffe2 100644 --- a/htroot/ViewProfile.html +++ b/htroot/ViewProfile.html @@ -45,6 +45,8 @@ |