AccessTracker: Fixed table output while no results are displayed --> all of AccessTracker should now validate XHTML 1.0 Strict, also tfoot must be defined before tbody

Connections_p: Added static protocol "http" for incoming connections because only http pool is queried and -UNRESOLVED PATTERN- is not really useful
de.lng: Minor changes and removed one old line

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

htroot/AccessTracker_p.html

@@ -82,6 +82,20 @@
         <td>User Agent</td>
       </tr>
     </thead>
+    <tfoot>
+      <tr class="TableHeader">
+        <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></td>
+        <td></td>
+      </tr>
+    </tfoot>
     <tbody>
       #{list}#
       <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
@@ -93,25 +107,11 @@
         <td>#[resulttime]#</td>
         <td>#[urltime]#</td>
         <td>#[snippettime]#</td>
-        <td><a href="/yacysearch.html?query=#[querystring]#&resource=local">#[querystring]#</a></td>
+        <td><a href="/yacysearch.html?query=#[querystring]#&amp;resource=local">#[querystring]#</a></td>
         <td>#[userAgent]#</td>
       </tr>
       #{/list}#
     </tbody>
-    <tfoot>
-      <tr class="TableHeader">
-        <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></td>
-        <td></td>
-      </tr>
-    </tfoot>
     </table>
     ::
     <h2>Local Search Host Tracker</h2>
@@ -126,6 +126,14 @@
         <td>Access Dates</td>
       </tr>
     </thead>
+    <tfoot>
+      <tr class="TableHeader">
+        <td></td>
+        <td>&#931; #[total]#</td>
+        <td>&#931; #[qph_sum]#</td>
+        <td></td>
+      </tr>
+    </tfoot>
     <tbody>
       #{list}#
       <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
@@ -136,14 +144,6 @@
       </tr>
       #{/list}#
     </tbody>
-    <tfoot>
-      <tr class="TableHeader">
-        <td></td>
-        <td>&#931; #[total]#</td>
-        <td>&#931; #[qph_sum]#</td>
-        <td></td>
-      </tr>
-    </tfoot>
     </table>
     ::
     <h2>Remote Search Log</h2>
@@ -163,21 +163,6 @@
         <td>Search Word Hashes</td>
       </tr>
     </thead>
-    <tbody>
-      #{list}#
-      <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
-        <td>#[host]#</td>
-        <td>#[peername]#</td>
-        <td>#[date]#</td>
-        <td>#[querycount]#</td>
-        <td>#[resultcount]#</td>
-        <td>#[resulttime]#</td>
-        <td>#[urltime]#</td>
-        <td>#[snippettime]#</td>
-        <td>#[queryhashes]#</td>
-      </tr>
-      #{/list}#
-    </tbody>
     <tfoot>
       <tr class="TableHeader">
         <td>Total: #[num]#
@@ -197,6 +182,21 @@
         <td></td>
       </tr>
     </tfoot>
+    <tbody>
+      #{list}#
+      <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
+        <td>#[host]#</td>
+        <td>#[peername]#</td>
+        <td>#[date]#</td>
+        <td>#[querycount]#</td>
+        <td>#[resultcount]#</td>
+        <td>#[resulttime]#</td>
+        <td>#[urltime]#</td>
+        <td>#[snippettime]#</td>
+        <td>#[queryhashes]#</td>
+      </tr>
+      #{/list}#
+    </tbody>
     </table>
     ::
     <h2>Remote Search Host Tracker</h2>
@@ -212,6 +212,15 @@
         <td>Access Dates</td>
       </tr>
     </thead>
+    <tfoot>
+      <tr class="TableHeader">
+        <td></td>
+        <td></td>
+        <td>&#931; #[total]#</td>
+        <td>&#931; #[qph_sum]#</td>
+        <td></td>
+      </tr>
+    </tfoot>
     <tbody>
       #{list}#
       <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
@@ -223,15 +232,6 @@
       </tr>
       #{/list}#
     </tbody>
-    <tfoot>
-      <tr class="TableHeader">
-        <td></td>
-        <td></td>
-        <td>&#931; #[total]#</td>
-        <td>&#931; #[qph_sum]#</td>
-        <td></td>
-      </tr>
-    </tfoot>
     </table>
     #(/page)#
     #%env/templates/footer.template%#

htroot/AccessTracker_p.java

@@ -193,8 +193,31 @@ public class AccessTracker_p {
             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;
+            // Put -1 instead of NaN as result for empty search list and return the safe HTML blank char for table output
+            if (m == 0) {
+                m = -1;
+                // return empty values to not break the table view
+                prop.put("page_list", 1);
+                prop.put("page_list_0_dark", 1 );
+                prop.put("page_list_0_host", " ");
+                prop.put("page_list_0_date", " ");
+                prop.put("page_list_0_timestamp", " ");
+                if (page == 2) {
+                    // local search
+                    prop.putNum("page_list_0_offset", "");
+                    prop.put("page_list_0_querystring", "");
+                } else {
+                    // remote search
+                    prop.put("page_list_0_peername", " ");
+                    prop.put("page_list_0_queryhashes", " ");
+                }
+                prop.putNum("page_list_0_querycount", "");
+                prop.putNum("page_list_0_resultcount", "");
+                prop.putNum("page_list_0_urltime", "");
+                prop.putNum("page_list_0_snippettime", "");
+                prop.putNum("page_list_0_resulttime", "");
+                prop.put("page_list_0_userAgent", " ");
+            }
             if (rcount == 0) rcount = -1;
             prop.putNum("page_querycount_avg", (double) qcountSum / m);
             prop.putNum("page_resultcount_avg", (double) rcountSum / m);
@@ -245,7 +268,19 @@ public class AccessTracker_p {
                 entCount++;
             }
             } catch (final ConcurrentModificationException e) {} // we dont want to synchronize this
-            prop.put("page_list", entCount);
+            // return empty values to not break the table view if no results can be listed
+            if (entCount==0) {                
+                prop.put("page_list", 1);
+                prop.put("page_list_0_dates_0_date", " ");
+                prop.put("page_list_0_dates", 1);
+                prop.putNum("page_list_0_qph", "");
+                prop.put("page_list_0_dark", 1 );
+                prop.put("page_list_0_peername", " ");
+                prop.put("page_list_0_host", " ");
+                prop.putNum("page_list_0_count", "");
+            } else {
+                prop.put("page_list", entCount);
+            }
             prop.putNum("page_num", entCount);
             prop.putNum("page_total", (page == 3) ? sb.localSearches.size() : sb.remoteSearches.size());
             prop.putNum("page_qph_sum", qphSum);

htroot/Connections_p.java

@@ -98,7 +98,7 @@ public final class Connections_p {
             if (userAddress == null) continue;
             
             String dest = null;
-            String prot = null;
+            String prot = "http"; // only httpd sessions listed
             
             if ((dest != null) && (dest.equals(virtualHost))) dest = sb.peers.mySeed().getName() + ".yacy";
             

locales/de.lng

@@ -37,6 +37,9 @@ Server Access Overview==Server Zugriff Überblick
 This is a list of \#\[num\]\# requests to the local http server within the last hour.==Dies ist eine Liste von #[num]# Anfragen, die an den lokalen HTTP Server innerhalb der letzten Stunde gestellt wurden.
 This is a list of requests to the local http server within the last hour.==Dies ist eine Liste von Anfragen, die innerhalb der letzten Stunde an den lokalen HTTP Server gestellt wurden.
 Showing \#\[num\]\# requests.==Gezeigt werden #[num]# Anfragen.
+#>Host<==>Host<
+>Path<==>Pfad<
+Date<==Datum<
 Access Count During==Erfasster Zugriff während der
 last Second==letzten Sekunde
 last Minute==letzten Minute
@@ -55,7 +58,6 @@ Remote Search Host Tracker==Remote Suche Host Tracker
 This is a list of searches that had been requested from this\' peer search interface==Dies ist eine Liste aller Suchanfragen, die von diesem Peer ausgeführt wurden.
 Showing \#\[num\]\# entries from a total of \#\[total\]\# requests.==Es werden #[num]# Einträge von insgesamt #[total]# Anfragen angezeigt.
 Requesting Host==Anfragender Host
-Date</td>==Datum</td>
 Offset==Versatz
 Expected Results==Erwartete Ergebnisse
 Returned Results==Gefundene Ergebnisse
@@ -63,6 +65,7 @@ Used Time \(ms\)==Gebrauchte Zeit (in ms)
 URL fetch \(ms\)==URL Abruf (in ms)
 Snippet comp \(ms\)==Vorschau Erzeugung (in ms)
 Query==Suchwort
+#>User Agent<==>User Agent<
 Search Word Hashes==Suchwort Hash
 Count</td>==Anzahl</td>
 Queries Per Last Hour==Suchanfragen pro letzter Stunde
@@ -3161,11 +3164,10 @@ Pictures==Bilder
 
 #File: yacysearchtrailer.html
 #---------------------------
+Show search results for "\#\[query\]\#" on map==Zeige die Suchergebnisse für "#[query]#" auf der Karte
 #>Domain Navigator==>Domain Navigator
 >Name Space Navigator==>Namespace Navigator
 >Author Navigator==>Autoren Navigator
->Topic Navigator==>Themen Navigator
-#Show search results for "#\[query\]#" on map!==Zeige die Suchergebnisse für "#[query]#" auf der Karte!
 #-----------------------------
 
 ### Subdirectory api ###