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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/29 14:23:10

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInteractive.ml 

Log message:
        patch #4995

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.775&tr2=1.776&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.70&tr2=1.71&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.775 mldonkey/distrib/ChangeLog:1.776
--- mldonkey/distrib/ChangeLog:1.775    Wed Mar 29 14:22:08 2006
+++ mldonkey/distrib/ChangeLog  Wed Mar 29 14:23:10 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/03/29
+4995: HTML: Fix friends filelist display
 4996: HTML: Add/remove for web_infos (vwi), update old contact.dat URL
 - web_infos, rename command add_url to urladd, new command urlremove
 - prints option help texts for web_infos and calendar command
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.70 
mldonkey/src/daemon/driver/driverInteractive.ml:1.71
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.70        Wed Mar 29 
14:22:08 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Wed Mar 29 14:23:10 2006
@@ -1440,7 +1440,7 @@
   let files = ref [] in
   (try
       List.iter (fun (rs, r,avail) ->
-          if !!display_downloaded_results || not r.result_done  then begin
+          if !!display_downloaded_results || not r.result_done then begin
               incr counter;
               nsources := !nsources + avail;
               totalsize := !totalsize ++ r.result_size ** (Int64.of_int avail);
@@ -1456,7 +1456,6 @@
                       (if new_result then "N" else " ")
                     !counter);
 
-
                 (if use_html_mods o then
                     "\\<td class=\\\"sr ar\\\"\\>" ^  size_of_int64 
r.result_size ^ "\\</td\\>"
                   else Int64.to_string r.result_size
@@ -1467,6 +1466,20 @@
                   else (string_of_int avail)
                 );
 
+                (if r.result_done then
+                   begin
+                       if use_html_mods o then
+                           "\\<td class=\\\"sr ar\\\"\\>D\\</td\\>"
+                         else "dled"
+                   end
+                 else
+                   begin
+                       if use_html_mods o then
+                           "\\<td class=\\\"sr ar\\\"\\> \\</td\\>"
+                         else " "
+                   end
+                );
+
                 (Printf.sprintf "%s%s%s"
                     (if o.conn_output = HTML then begin
                         if !!html_mods then Printf.sprintf "\\<td 
class=\\\"sr\\\"\\>\\<a href=results\\?d=%d target=\\\"$S\\\"\\>" r.result_num
@@ -1476,8 +1489,6 @@
 
                   ( shorten (
                       let names = r.result_names in
-                      let names = if r.result_done then
-                          ["ALREADY DOWNLOADED "] @ names else names in
                       let names = match  r.result_comment with
                           "" -> names
                         |  comment ->
@@ -1506,7 +1517,6 @@
                   )
                 );
 
-
                 (let buf = Buffer.create 100 in
 
                   if use_html_mods o then Buffer.add_string buf "\\<td 
class=\\\"sr\\\"\\>";
@@ -1518,7 +1528,7 @@
                             String s -> s
                           | Uint64 i -> Int64.to_string i
                           | Fint64 i -> Int64.to_string i
-                          | _ -> "???"
+                          | _ -> ""
                         ))
                   ) r.result_tags;
                   Buffer.contents buf);
@@ -1541,6 +1551,7 @@
                ( "1", "srh", "Number", "#" ) ;
                ( "1", "srh ar", "Size", "Size" ) ;
                ( "0", "srh ar", "Availability", "A" )  ;
+               ( "0", "srh ar", "Status, D = already downloaded", "S" )  ;
                ( "0", "srh", "Filename", "Name" ) ;
                ( "0", "srh", "Tag", "Tag" ) ;
                ( "0", "srh", "MD4", "MD4" ) ];
@@ -1552,11 +1563,12 @@
 
   else
 
-    print_table buf [| Align_Left; Align_Right; Align_Right; Align_Left; 
Align_Left; Align_Left|]
+    print_table buf [| Align_Left; Align_Right; Align_Right; Align_Right; 
Align_Left; Align_Left; Align_Left|]
       [|
       "[ Num ]";
       "Size";
       "Avail";
+      "Status";
       "Names";
       "Tags";
       "MD4";
@@ -1579,7 +1591,6 @@
     ) !results in
 
   Printf.bprintf buf "Result of search %d\n" s.search_num;
-  Printf.bprintf buf "Reinitialising download selectors\n";
   Printf.bprintf buf "%d results (%s)\n" s.search_nresults
     (if s.search_waiting = 0 then "done" else
       (string_of_int s.search_waiting) ^ " waiting");