new remote search average

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

htroot/AccessTracker_p.html

@@ -159,14 +159,20 @@
       </tr>
       #{/list}#
       <tr class="TableHeader">
+        <td>Total: #[num]#
+        <br/>Success: #[resultcount]#</td>
         <td></td>
         <td></td>
-        <td></td>
-        <td>&#216; #[querycount_avg]#</td>
-        <td>&#216; #[resultcount_avg]#</td>
-        <td>&#216; #[resulttime_avg]#</td>
-        <td>&#216; #[urltime_avg]#</td>
-        <td>&#216; #[snippettime_avg]#</td>
+        <td>&#216; #[querycount_avg]#
+        <br/>&#216; #[querycount_avg1]#</td>
+        <td>&#216; #[resultcount_avg]#
+        <br/>&#216; #[resultcount_avg1]#</td>
+        <td>&#216; #[resulttime_avg]#
+        <br/>&#216; #[resulttime_avg1]#</td>
+        <td>&#216; #[urltime_avg]#
+        <br/>&#216; #[urltime_avg1]#</td>
+        <td>&#216; #[snippettime_avg]#
+        <br/>&#216; #[snippettime_avg1]#</td>
         <td></td>
       </tr>
     </table>

htroot/AccessTracker_p.java

@@ -140,6 +140,7 @@ public class AccessTracker_p {
             int m = Math.min(maxCount, array.size());
             long qcountSum = 0;
             long rcountSum = 0;
+            long rcount = 0;
             long utimeSum = 0;
             long stimeSum = 0;
             long rtimeSum = 0;
@@ -169,20 +170,28 @@ public class AccessTracker_p {
                 prop.putNum("page_list_" + entCount + "_resulttime", searchProfile.searchtime);
                 qcountSum += searchProfile.linesPerPage;
                 rcountSum += searchProfile.resultcount;
+                if (searchProfile.resultcount > 0) rcount++;
                 utimeSum += searchProfile.urlretrievaltime;
                 stimeSum += searchProfile.snippetcomputationtime;
                 rtimeSum += searchProfile.searchtime;
             }
             prop.put("page_list", m);
             prop.put("page_num", m);
+            prop.put("page_resultcount", rcount);
             
             // Put -1 instead of NaN as result for empty search list
             if (m == 0) m = -1;
+            if (rcount == 0) rcount = -1;
             prop.putNum("page_querycount_avg", (double) qcountSum / m);
             prop.putNum("page_resultcount_avg", (double) rcountSum / m);
             prop.putNum("page_urltime_avg", (double) utimeSum / m);
             prop.putNum("page_snippettime_avg", (double) stimeSum / m);
             prop.putNum("page_resulttime_avg", (double) rtimeSum / m);
+            prop.putNum("page_querycount_avg1", (double) qcountSum / rcount);
+            prop.putNum("page_resultcount_avg1", (double) rcountSum / rcount);
+            prop.putNum("page_urltime_avg1", (double) utimeSum / rcount);
+            prop.putNum("page_snippettime_avg1", (double) stimeSum / rcount);
+            prop.putNum("page_resulttime_avg1", (double) rtimeSum / rcount);
             prop.putNum("page_total", (page == 2) ? sb.localSearches.size() : sb.remoteSearches.size());
         }
         if ((page == 3) || (page == 5)) {