diff --git a/htroot/Network.html b/htroot/Network.html index f95fef299..ba44e75d0 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -71,8 +71,8 @@ p   w   #(updatedProfile)#::#(/updatedProfile)# - #(updatedWikiPage)#::#(/updatedWikiPage)# - #(updatedBlog)#::#(/updatedBlog)# + #(updatedWiki)#::#(/updatedWiki)# + #(updatedBlog)#::#(/updatedBlog)# #(isCrawling)#::#(/isCrawling)# #[shortname]# diff --git a/htroot/Network.java b/htroot/Network.java index 746d3d107..a7e1dfe1f 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -49,6 +49,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.io.IOException; import de.anomic.http.httpHeader; import de.anomic.http.httpc; @@ -255,9 +256,9 @@ public class Network { } else if (record.category().equals("prfleupd")) { updatedProfile.add(record.originator()); } else if (record.category().equals("wiki_upd")) { - updatedWiki.put(record.originator(), record.attributes().get("page")); + updatedWiki.put(record.originator(), record.attributes()); } else if (record.category().equals("blog_add")) { - updatedBlog.put(record.originator(), record.attributes().get("page")); + updatedBlog.put(record.originator(), record.attributes()); } else if (record.category().equals("crwlstrt")) { isCrawling.put(record.originator(), record.attributes().get("startURL")); } @@ -276,8 +277,8 @@ public class Network { } int p; String startURL; - String wikiPage; - String blogPage; + Map wikiMap; + Map blogMap; String userAgent, location; int PPM; long myValue=0, nextValue=0, prevValue=0, nextPPM=0, myPPM=0; @@ -316,21 +317,20 @@ public class Network { prop.put(STR_TABLE_LIST + conCount + "_updatedProfile", 1); prop.put(STR_TABLE_LIST + conCount + "_updatedProfile_hash", seed.hash); } - if ((wikiPage = (String) updatedWiki.get(seed.hash)) == null) { - prop.put(STR_TABLE_LIST + conCount + "_updatedWikiPage", 0); + if ((wikiMap = (Map) updatedWiki.get(seed.hash)) == null) { + prop.put(STR_TABLE_LIST + conCount + "_updatedWiki", 0); } else { - prop.put(STR_TABLE_LIST + conCount + "_updatedWikiPage", 1); - prop.put(STR_TABLE_LIST + conCount + "_updatedWikiPage_page", wikiPage); - prop.put(STR_TABLE_LIST + conCount + "_updatedWikiPage_address", seed.getAddress()); - prop.put(STR_TABLE_LIST + conCount + "_updatedWikiPage_name", seed.get(yacySeed.NAME, "deadlink")); + prop.put(STR_TABLE_LIST + conCount + "_updatedWiki", 1); + prop.put(STR_TABLE_LIST + conCount + "_updatedWiki_page", (String) wikiMap.get("page")); + prop.put(STR_TABLE_LIST + conCount + "_updatedWiki_address", seed.getAddress()); } - if ((blogPage = (String) updatedBlog.get(seed.hash)) == null) { + if ((blogMap = (Map) updatedBlog.get(seed.hash)) == null) { prop.put(STR_TABLE_LIST + conCount + "_updatedBlog", 0); } else { prop.put(STR_TABLE_LIST + conCount + "_updatedBlog", 1); - prop.put(STR_TABLE_LIST + conCount + "_updatedBlog_page", blogPage); + prop.put(STR_TABLE_LIST + conCount + "_updatedBlog_page", (String) blogMap.get("page")); + prop.put(STR_TABLE_LIST + conCount + "_updatedBlog_subject", (String) blogMap.get("subject")); prop.put(STR_TABLE_LIST + conCount + "_updatedBlog_address", seed.getAddress()); - prop.put(STR_TABLE_LIST + conCount + "_updatedBlog_name", seed.get(yacySeed.NAME, "deadlink")); } try { PPM = Integer.parseInt(seed.get(yacySeed.ISPEED, "-")); diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html index b3c6c627a..5fdeb3639 100644 --- a/htroot/PerformanceMemory_p.html +++ b/htroot/PerformanceMemory_p.html @@ -81,8 +81,8 @@ Database
  DB Size
  -Node Cache -Object Cache +Node Cache +Object Cache Memory Occupation (KBytes) Description
  @@ -90,13 +90,10 @@ Chunk Size
high/med/low
(bytes) Empty
(avail.)
Slots -Used
High Prio -Used
Medium Prio -Used
Low Prio -Chunk Size
Max -Chunk Size
Current -Hit/
Miss
Ratio
-Unique/
Double
Ratio
+Used:
High, Medium, Low
Prio + 
Size
Max + 
Size
Current +Ratio
Hit:Miss
Unique:Double
Used Now Assigned Max Default Max @@ -109,13 +106,10 @@ #[slreqRWI]# #[chunkRWI]# #[slempRWI]# -#[slhigRWI]# -#[slmedRWI]# -#[sllowRWI]# +#[slhigRWI]#
#[slmedRWI]#
#[sllowRWI]# #[ochunkmaxRWI]# #[ochunkcurRWI]# -#[ohittmissRWI]# -#[ouniqdoubRWI]# +#[ohittmissRWI]#
#[ouniqdoubRWI]# #[usedRWI]# #[dfltRWI]# @@ -131,13 +125,10 @@ cache will speed up crawls with a depth > 3. #[slreqHTTP]# #[chunkHTTP]# #[slempHTTP]# -#[slhigHTTP]# -#[slmedHTTP]# -#[sllowHTTP]# +#[slhigHTTP]#
#[slmedHTTP]#
#[sllowHTTP]# #[ochunkmaxHTTP]# #[ochunkcurHTTP]# -#[ohittmissHTTP]# -#[ouniqdoubHTTP]# +#[ohittmissHTTP]#
#[ouniqdoubHTTP]# #[usedHTTP]# #[dfltHTTP]# @@ -153,13 +144,10 @@ Increasing this cache will be most important for a fast proxy mode. #[slreqLURL]# #[chunkLURL]# #[slempLURL]# -#[slhigLURL]# -#[slmedLURL]# -#[sllowLURL]# +#[slhigLURL]#
#[slmedLURL]#
#[sllowLURL]# #[ochunkmaxLURL]# #[ochunkcurLURL]# -#[ohittmissLURL]# -#[ouniqdoubLURL]# +#[ohittmissLURL]#
#[ouniqdoubLURL]# #[usedLURL]# #[dfltLURL]# @@ -174,13 +162,10 @@ This cache is very important for a fast search process. Increasing the cache siz #[slreqNURL]# #[chunkNURL]# #[slempNURL]# -#[slhigNURL]# -#[slmedNURL]# -#[sllowNURL]# +#[slhigNURL]#
#[slmedNURL]#
#[sllowNURL]# #[ochunkmaxNURL]# #[ochunkcurNURL]# -#[ohittmissNURL]# -#[ouniqdoubNURL]# +#[ohittmissNURL]#
#[ouniqdoubNURL]# #[usedNURL]# #[dfltNURL]# @@ -195,13 +180,10 @@ Increasing the cache size will result in faster double-check during URL recognit #[slreqEURL]# #[chunkEURL]# #[slempEURL]# -#[slhigEURL]# -#[slmedEURL]# -#[sllowEURL]# +#[slhigEURL]#
#[slmedEURL]#
#[sllowEURL]# #[ochunkmaxEURL]# #[ochunkcurEURL]# -#[ohittmissEURL]# -#[ouniqdoubEURL]# +#[ohittmissEURL]#
#[ouniqdoubEURL]# #[usedEURL]# #[dfltEURL]# @@ -216,13 +198,10 @@ Increasing the cache size will most probably speed up crawling slightly, but not #[slreqDHT]# #[chunkDHT]# #[slempDHT]# -#[slhigDHT]# -#[slmedDHT]# -#[sllowDHT]# +#[slhigDHT]#
#[slmedDHT]#
#[sllowDHT]# #[ochunkmaxDHT]# #[ochunkcurDHT]# -#[ohittmissDHT]# -#[ouniqdoubDHT]# +#[ohittmissDHT]#
#[ouniqdoubDHT]# #[usedDHT]# #[dfltDHT]# @@ -238,13 +217,10 @@ Increasing this cache may speed up many functions, but we need to test this to s #[slreqMessage]# #[chunkMessage]# #[slempMessage]# -#[slhigMessage]# -#[slmedMessage]# -#[sllowMessage]# +#[slhigMessage]#
#[slmedMessage]#
#[sllowMessage]# #[ochunkmaxMessage]# #[ochunkcurMessage]# -#[ohittmissMessage]# -#[ouniqdoubMessage]# +#[ohittmissMessage]#
#[ouniqdoubMessage]# #[usedMessage]# #[dfltMessage]# @@ -258,13 +234,10 @@ Increasing this cache may speed up many functions, but we need to test this to s #[slreqWiki]# #[chunkWiki]# #[slempWiki]# -#[slhigWiki]# -#[slmedWiki]# -#[sllowWiki]# +#[slhigWiki]#
#[slmedWiki]#
#[sllowWiki]# #[ochunkmaxWiki]# #[ochunkcurWiki]# -#[ohittmissWiki]# -#[ouniqdoubWiki]# +#[ohittmissWiki]#
#[ouniqdoubWiki]# #[usedWiki]# #[dfltWiki]# @@ -280,13 +253,10 @@ Increasing this cache may speed up access to the wiki pages. #[slreqBlog]# #[chunkBlog]# #[slempBlog]# -#[slhigBlog]# -#[slmedBlog]# -#[sllowBlog]# +#[slhigBlog]#
#[slmedBlog]#
#[sllowBlog]# #[ochunkmaxBlog]# #[ochunkcurBlog]# -#[ohittmissBlog]# -#[ouniqdoubBlog]# +#[ohittmissBlog]#
#[ouniqdoubBlog]# #[usedBlog]# #[dfltBlog]# @@ -301,13 +271,10 @@ Increasing this cache may speed up access to the Blog. #[slreqNews]# #[chunkNews]# #[slempNews]# -#[slhigNews]# -#[slmedNews]# -#[sllowNews]# +#[slhigNews]#
#[slmedNews]#
#[sllowNews]# #[ochunkmaxNews]# #[ochunkcurNews]# -#[ohittmissNews]# -#[ouniqdoubNews]# +#[ohittmissNews]#
#[ouniqdoubNews]# #[usedNews]# #[dfltNews]# @@ -322,13 +289,10 @@ Increasing this cache may speed up the peer-ping. #[slreqRobots]# #[chunkRobots]# #[slempRobots]# -#[slhigRobots]# -#[slmedRobots]# -#[sllowRobots]# +#[slhigRobots]#
#[slmedRobots]#
#[sllowRobots]# #[ochunkmaxRobots]# #[ochunkcurRobots]# -#[ohittmissRobots]# -#[ouniqdoubRobots]# +#[ohittmissRobots]#
#[ouniqdoubRobots]# #[usedRobots]# #[dfltRobots]# @@ -343,13 +307,10 @@ Increasing this cache may speed up validation if crawling of the URL is allowed. #[slreqProfiles]# #[chunkProfiles]# #[slempProfiles]# -#[slhigProfiles]# -#[slmedProfiles]# -#[sllowProfiles]# +#[slhigProfiles]#
#[slmedProfiles]#
#[sllowProfiles]# #[ochunkmaxProfiles]# #[ochunkcurProfiles]# -#[ohittmissProfiles]# -#[ouniqdoubProfiles]# +#[ohittmissProfiles]#
#[ouniqdoubProfiles]# #[usedProfiles]# #[dfltProfiles]# @@ -360,7 +321,7 @@ Increasing this cache may speed up crawling, but not much space is needed, so th -Totals +Totals #[usedTotal]# MB #[currTotal]# MB #[dfltTotal]# MB @@ -370,7 +331,7 @@ Increasing this cache may speed up crawling, but not much space is needed, so th -Re-Configuration: +Re-Configuration:
these
custom
values
 
all
default
values
 
all
recom-
mended values