Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/AccessTracker_p.html

@@ -192,7 +192,7 @@
         <td>#[peername]#</td>
         <td>#[date]#</td>
         <td>#[querycount]#</td>
-        <td>#[resultcount]#</td>
+        <td>#[transmitcount]#</td>
         <td>#[resulttime]#</td>
         <td>#[urltime]#</td>
         <td>#[snippettime]#</td>

htroot/AccessTracker_p.java

@@ -185,11 +185,11 @@ public class AccessTracker_p {
                 stimeSum += query.snippetcomputationtime;
                 rtimeSum += query.searchtime;
                 
-                if (query.transmitcount> 0){
+                if (query.transmitcount > 0){
                     rcount++;
                 /*  utimeSum1 += query.urlretrievaltime;
-                    stimeSum1 += query.snippetcomputationtime;
+                    stimeSum1 += query.snippetcomputationtime; */
-                    rtimeSum1 += query.searchtime; */
+                    rtimeSum1 += query.searchtime;
                 }                
                 m++;
             }

htroot/env/templates/submenuIndexControl.template

@@ -6,7 +6,7 @@
     <li><a href="/IndexSchema_p.html" class="MenuItemLink lock">Solr Schema Editor</a></li>
     #(p2p)#::<li><a href="/IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index</a></li>#(/p2p)#
     <!--<li><a href="/IndexControlCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>-->
-    <li><a href="/ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>
+    <!--<li><a href="/ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>-->
     <li><a href="/ConfigHTCache_p.html" class="MenuItemLink lock">Web Cache</a></li>
     <li><a href="/ConfigParser.html" class="MenuItemLink lock">Parser Configuration</a></li>
   </ul>