[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/02/04 17:22:18

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml 
        src/networks/bittorrent: bTInteractive.ml 

Log message:
        patch #5723

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1171&r2=1.1172
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.126&r2=1.127

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1171
retrieving revision 1.1172
diff -u -b -r1.1171 -r1.1172
--- distrib/ChangeLog   4 Feb 2007 17:21:05 -0000       1.1171
+++ distrib/ChangeLog   4 Feb 2007 17:22:18 -0000       1.1172
@@ -15,6 +15,7 @@
 =========
 
 2007/02/04
+5723: HTML: print tracker errors in html table at 'vd <num>' (Schlumpf)
 5722: HTML: use Printf2.html_mods_cntr () for table row classes (Schlumpf)
 5720: Swarmer: block choice algorithm 2 from patch 5141 is new default
 - remove swarming_block_selection_algorithm = 1

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- src/daemon/driver/driverCommands.ml 4 Feb 2007 17:21:05 -0000       1.218
+++ src/daemon/driver/driverCommands.ml 4 Feb 2007 17:22:18 -0000       1.219
@@ -2881,10 +2881,10 @@
                   Printf.bprintf buf "\\<div class=\\\"sourcesTable 
al\\\"\\>\\<table cellspacing=0 cellpadding=0\\>
                                \\<tr\\>\\<td\\>
                                \\<table cellspacing=0 cellpadding=0 
width=100%%\\>\\<tr\\>
-                               \\<td nowrap class=\\\"fbig\\\"\\>\\<a 
href=\\\"files\\\"\\>Display all files\\</a\\>\\</td\\>
-                               \\<td nowrap class=\\\"fbig\\\"\\>\\<a 
href=\\\"submit?q=verify_chunks+%d\\\"\\>Verify chunks\\</a\\>\\</td\\>
-                               \\<td nowrap class=\\\"fbig\\\"\\>\\<a 
href=\\\"preview_download?q=%d\\\"\\>Preview\\</a\\>\\</td\\>
-                               \\<td nowrap class=\\\"fbig pr\\\"\\>\\<a 
href=\\\"javascript:window.location.reload()\\\"\\>Reload\\</a\\>\\</td\\>
+                               \\<td nowrap class=\\\"fbig\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='files'\\\"\\>Display all 
files\\</a\\>\\</td\\>
+                               \\<td nowrap class=\\\"fbig\\\"\\>\\<a 
onClick=\\\"javascript:parent.fstatus.location.href='submit?q=verify_chunks+%d'\\\"\\>Verify
 chunks\\</a\\>\\</td\\>
+                               \\<td nowrap class=\\\"fbig\\\"\\>\\<a 
onClick=\\\"javascript:parent.fstatus.location.href='preview_download?q=%d'\\\"\\>Preview\\</a\\>\\</td\\>
+                               \\<td nowrap class=\\\"fbig pr\\\"\\>\\<a 
onclick=\\\"javascript:window.location.reload()\\\"\\>Reload\\</a\\>\\</td\\>
                                \\<td class=downloaded width=100%%\\>\\</td\\>
                                \\</tr\\>\\</table\\>
                                \\</td\\>\\</tr\\>

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- src/networks/bittorrent/bTInteractive.ml    30 Jan 2007 21:23:01 -0000      
1.126
+++ src/networks/bittorrent/bTInteractive.ml    4 Feb 2007 17:22:18 -0000       
1.127
@@ -171,18 +171,21 @@
   Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr 
());
   let tracker_header_printed = ref false in
   List.iter (fun tracker ->
-    let tracker_text, tracker_error =
-      (match tracker.tracker_status with
-         Disabled s | Disabled_mld s | Disabled_failure s -> 
-           Printf.sprintf "disabled: %s" tracker.tracker_url, s
-       | _ -> tracker.tracker_url, "")
+    let tracker_text =
+      match tracker.tracker_status with
+        | Disabled s | Disabled_mld s | Disabled_failure s -> 
+            Printf.sprintf "\\<font color=\\\"red\\\"\\>disabled: 
%s\\<br\\>\\--error: %s\\</font\\>" tracker.tracker_url s
+        | _ ->
+            Printf.sprintf "enabled: %s" tracker.tracker_url
+
     in
     html_mods_td buf [
       (if not !tracker_header_printed then
-        ("Tracker(s) (mouseover for errors)", "sr br", "Tracker(s)")
+        ("Tracker(s)", "sr br", "Tracker(s)")
        else
-       ("", "sr br", ""));
-      (tracker_error, "sr", tracker_text)];
+        ("", "sr br", "")
+      );
+      (tracker.tracker_url, "sr", tracker_text)];
     Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr 
());
     tracker_header_printed := true;
   ) file.file_trackers;