[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/25 18:16:57

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonServer.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/donkey: donkeyInteractive.ml 

Log message:
        patch #5489

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1066&r2=1.1067
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonServer.ml?cvsroot=mldonkey&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.131&r2=1.132

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1066
retrieving revision 1.1067
diff -u -b -r1.1066 -r1.1067
--- distrib/ChangeLog   25 Oct 2006 11:34:45 -0000      1.1066
+++ distrib/ChangeLog   25 Oct 2006 18:16:56 -0000      1.1067
@@ -15,6 +15,7 @@
 =========
 
 2006/10/25
+5489: HTML: Improve serverlist display (Schlumpf)
 5487: Update URLs, change mldonkey.net to mldonkey.org
 5485: HTML: Print sharing strategies in command "shares"
 5461: Release slot, fix missing filenames in upstats

Index: src/daemon/common/commonServer.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonServer.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/daemon/common/commonServer.ml   8 Oct 2006 14:20:21 -0000       1.35
+++ src/daemon/common/commonServer.ml   25 Oct 2006 18:16:56 -0000      1.36
@@ -450,13 +450,13 @@
         Printf.sprintf
         "\\<TD class=\\\"srb\\\" onMouseOver=\\\"mOvr(this);\\\"
         onMouseOut=\\\"mOut(this);\\\" title=\\\"Unset preferred\\\"
-        
onClick=\\\"parent.fstatus.location.href='submit?q=preferred+false+%s'\\\"\\>T\\</TD\\>"
+        
onClick=\\\"parent.fstatus.location.href='submit?q=preferred+false+%s'\\\"\\>P\\</TD\\>"
         (Ip.string_of_addr info.G.server_addr)
         end else begin
         Printf.sprintf
         "\\<TD class=\\\"srb\\\" onMouseOver=\\\"mOvr(this);\\\"
         onMouseOut=\\\"mOut(this);\\\" title=\\\"Set preferred\\\"
-        
onClick=\\\"parent.fstatus.location.href='submit?q=preferred+true+%s'\\\"\\>F\\</TD\\>"
+        
onClick=\\\"parent.fstatus.location.href='submit?q=preferred+true+%s'\\\"\\>-\\</TD\\>"
         (Ip.string_of_addr info.G.server_addr)
         end
       );
@@ -506,16 +506,16 @@
 
     let cc,cn = Geoip.get_country (Ip.ip_of_addr info.G.server_addr) in
     html_mods_td buf ([
-      ("", "srb", if info.G.server_master then "T" else "F");
+      ("", "srb", if info.G.server_master then "M" else "-");
       (id_title, "sr", id_text);
       ("", "sr", n.network_name);
       ("", "sr", server_state_string);
       ("", "sr br", ip_port_string);
       ] @ (if !Geoip.active then [(cn, "sr br", cc)] else []) @ [
-      ("", "sr ar", Printf.sprintf "%Ld" info.G.server_nusers);
-      ("", "sr ar br", Printf.sprintf "%Ld" info.G.server_max_users);
-      ("", "sr ar br", Printf.sprintf "%Ld" info.G.server_lowid_users);
-      ("", "sr ar", Printf.sprintf "%Ld" info.G.server_nfiles)]);
+      ("", "sr ar", if info.G.server_nusers = Int64.zero then "" else 
Printf.sprintf "%Ld" info.G.server_nusers);
+      ("", "sr ar br", if info.G.server_max_users = Int64.zero then "" else 
Printf.sprintf "%Ld" info.G.server_max_users);
+      ("", "sr ar br", if info.G.server_lowid_users = Int64.zero then "" else 
Printf.sprintf "%Ld" info.G.server_lowid_users);
+      ("", "sr ar", if info.G.server_nfiles = Int64.zero then "" else 
Printf.sprintf "%Ld" info.G.server_nfiles)]);
 
     if info.G.server_published_files = 0 then
       html_mods_td buf ([("", "sr br", "")])
@@ -527,9 +527,9 @@
        snum info.G.server_published_files;
 
     html_mods_td buf ([
-      ("", "sr ar", Printf.sprintf "%Ld" info.G.server_soft_limit);
-      ("", "sr ar br", Printf.sprintf "%Ld" info.G.server_hard_limit);
-      ("", "sr ar br", Printf.sprintf "%d" info.G.server_ping);
+      ("", "sr ar", if info.G.server_soft_limit = Int64.zero then "" else 
Printf.sprintf "%Ld" info.G.server_soft_limit);
+      ("", "sr ar br", if info.G.server_hard_limit = Int64.zero then "" else 
Printf.sprintf "%Ld" info.G.server_hard_limit);
+      ("", "sr ar br", if info.G.server_ping = 0 then "" else Printf.sprintf 
"%d" info.G.server_ping);
       ("", "sr br", info.G.server_version);
       ("", "sr", info.G.server_name);
     ]);

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- src/daemon/driver/driverCommands.ml 25 Oct 2006 11:14:02 -0000      1.188
+++ src/daemon/driver/driverCommands.ml 25 Oct 2006 18:16:56 -0000      1.189
@@ -1471,7 +1471,7 @@
 
             Printf.bprintf buf "\\</td\\>\\</tr\\>\\<tr\\>\\<td\\>\\<table 
cellspacing=0 cellpadding=0  width=100%%\\>\\<tr\\>\\<td class=downloaded 
width=100%%\\>\\</td\\>
 \\<td nowrap title=\\\"Toggle option helptext from javascript popup to html 
table\\\" class=\\\"fbig fbigb pr fbigpad\\\"\\>
-\\<a onclick=\\\"javascript: 
{parent.fstatus.location.href='submit?q=set+html_mods_use_js_helptext+%s'; 
setTimeout('window.location.replace(window.location.href)',1000);return 
true;}\\\"\\>Toggle js_helptext\\</a\\>
+\\<a onclick=\\\"javascript: 
{parent.fstatus.location.href='submit?q=set+html_mods_use_js_helptext+%s'; 
setTimeout('window.location.replace(window.location.href)',1000);return 
true;}\\\"\\>toggle js_helptext\\</a\\>
 
\\</td\\>\\</tr\\>\\</table\\>\\</td\\>\\</tr\\>\\</table\\>\\</div\\>\\</br\\>"
 (if !!html_mods_use_js_helptext then "false" else "true");
             
             html_mods_table_one_row buf "downloaderTable" "downloaders" [
@@ -1829,7 +1829,7 @@
 \\<td class=downloaded width=100%%\\>\\</td\\>
 \\<td nowrap title=\\\"Change to simple Webinterface without html_mods\\\" 
class=\\\"fbig fbigb fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=html_mods'\\\"\\>toggle 
html_mods\\</a\\>\\</td\\>
 \\<td nowrap title=\\\"Toggle option helptext from javascript popup to html 
table\\\" class=\\\"fbig fbigb pr fbigpad\\\"\\>
-\\<a onclick=\\\"javascript: 
{parent.fstatus.location.href='submit?q=set+html_mods_use_js_helptext+%s'; 
setTimeout('window.location.replace(window.location.href)',1000);return 
true;}\\\"\\>Toggle js_helptext\\</a\\>
+\\<a onclick=\\\"javascript: 
{parent.fstatus.location.href='submit?q=set+html_mods_use_js_helptext+%s'; 
setTimeout('window.location.replace(window.location.href)',1000);return 
true;}\\\"\\>toggle js_helptext\\</a\\>
 
\\</td\\>\\</tr\\>\\</table\\>\\</td\\>\\</tr\\>\\</table\\>\\</div\\>\\</br\\>"
 (if !!html_mods_use_js_helptext then "false" else "true");
           html_mods_table_one_row buf "downloaderTable" "downloaders" [
           ("", "srh", "!! press ENTER to send changes to core !!"); ];

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- src/networks/donkey/donkeyInteractive.ml    25 Oct 2006 11:12:38 -0000      
1.131
+++ src/networks/donkey/donkeyInteractive.ml    25 Oct 2006 18:16:56 -0000      
1.132
@@ -1746,14 +1746,14 @@
     (fun url filename ->
     if !!enable_donkey && !!update_server_list_server_met then
       begin
-        lprintf_n "server.met loaded from %s" url;
+        lprintf_nl "server.met loaded from %s" url;
   begin
     try
       let s = unpack_server_met filename url in
         let nservers = List.length (Hashtbl2.to_list servers_by_key) in
               let n = load_server_met s in
                 if s <> filename then Sys.remove s;
-            lprintf ", %d servers found, %d new ones inserted"
+            lprintf_nl "%d servers found, %d new ones inserted"
         n ((List.length (Hashtbl2.to_list servers_by_key)) - nservers)
            with _ -> ()
   end;