fixed dht-urls and ranking distribution log statistics

* NOTE: please have in mind that there can be whitespaces in pathnames

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4956 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/LogStatistics_p.html

@@ -20,7 +20,7 @@
             <dt>URLs Received:</dt><dd>#[urlSum]#</dd>
             <dt>URLs Requested:</dt><dd>#[urlReqSum]#</dd>
             <dt>URLs Blocked:</dt><dd>#[blockedURLSum]#</dd>
-            <dt>Total time:</dt><dd>#[urlTimeSum]# #[urlTimeSumUnit]#</dd>
+            <dt>Total receive time:</dt><dd>#[urlTimeSum]# #[urlTimeSumUnit]#</dd>
             <dt>URLs Sent:</dt><dd>#[DHTSendURLs]#</dd>
           </dl>
         </fieldset>
@@ -29,9 +29,9 @@
           <legend>RWIs / Words</legend>
           <dl style="margin-top: .3em;">
             <dt>Words received:</dt><dd>#[wordsSum]#</dd>
-            <dt>RWIs reveived:</dt><dd>#[rwiSum]#</dd>
+            <dt>RWIs received:</dt><dd>#[rwiSum]#</dd>
             <dt>RWIs blocked:</dt><dd>#[blockedRWISum]#</dd>
-            <dt>Total time:</dt><dd>#[rwiTimeSum]# #[rwiTimeSumUnit]#</dd>
+            <dt>Total receive processing time:</dt><dd>#[rwiTimeSum]# #[rwiTimeSumUnit]#</dd>
             <dt>RWIs selected:</dt><dd>#[DHTSelectionWordsCount]#</dd>
             <dt>Selection time:</dt><dd>#[DHTSelectionWordsTimeCount]#</dd>
           </dl>

source/de/anomic/server/logging/logParsers/LogParserPLASMA.java

@@ -185,7 +185,7 @@ public class LogParserPLASMA implements LogParser{
     private final String parserType = "PLASMA";
 
     //RegExp for LogLevel I
-    private static final Pattern i1 = Pattern.compile("Received (\\d*) URLs from peer [\\w-_]{12}:[\\w-_]*/[\\w.-]* in (\\d*) ms, Blocked (\\d*) URLs");
+    private static final Pattern i1 = Pattern.compile("Received (\\d*) URLs from peer [\\w-_]{12}:[\\w-_]*/[\\w.-]* in (\\d*) ms, blocked (\\d*) URLs");
     private static final Pattern i2 = Pattern.compile("Received (\\d*) Entries (\\d*) Words \\[[\\w-_]{12} .. [\\w-_]{12}\\]/[\\w.-]* from [\\w-_]{12}:[\\w-_]*/[\\w.-]*, processed in (\\d*) milliseconds, requesting (\\d*)/(\\d*) URLs, blocked (\\d*) RWIs");
     private static final Pattern i2_2 = Pattern.compile("Received (\\d*) Entries (\\d*) Words \\[[\\w-_]{12} .. [\\w-_]{12}\\]/[\\w.-]* from [\\w-_]{12}:[\\w-_]*, processed in (\\d*) milliseconds, requesting (\\d*)/(\\d*) URLs, blocked (\\d*) RWIs");
     private static final Pattern i3 = Pattern.compile("Index transfer of (\\d*) words \\[[\\w-_]{12} .. [\\w-_]{12}\\] to peer ([\\w-_]*):([\\w-_]{12}) in (\\d*) seconds successful \\((\\d*) words/s, (\\d*) Bytes\\)");
@@ -194,7 +194,7 @@ public class LogParserPLASMA implements LogParser{
     private static final Pattern i6 = Pattern.compile("Rejecting RWIs from peer ([\\w-_]{12}):([\\w-_]*)/([\\w.]*). ([\\w. ]*)");
     private static final Pattern i7 = Pattern.compile("DHT distribution: transfer to peer [\\w-]* finished.");
     private static final Pattern i8 = Pattern.compile("Index selection of (\\d*) words \\[[\\w-_]{12} .. [\\w-_]{12}\\] in (\\d*) seconds");
-    private static final Pattern i9 = Pattern.compile("RankingDistribution - transmitted file [\\w-:.\\\\]* to [\\w.]*:\\d* successfully in (\\d)* seconds");
+    private static final Pattern i9 = Pattern.compile("RankingDistribution - transmitted file [\\w\\s-:.\\\\]* to [\\w.]*:\\d* successfully in (\\d)* seconds");
     private static final Pattern i10 = Pattern.compile("RankingDistribution - error transmitting file");
     private static final Pattern i11 = Pattern.compile("Peer [\\w-_]*:[\\w-_]{12} is busy\\. Waiting \\d* ms\\.");
     //private static Pattern i12 = Pattern.compile("\\*Indexed \\d* words in URL [\\w:.&/%-~$\u00A7@=]* \\[[\\w-_]{12}\\]");