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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       09/10/22 19:56:43

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

Log message:
        patch #6772

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1398&r2=1.1399
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.227&r2=1.228
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.250&r2=1.251
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.138&r2=1.139

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1398
retrieving revision 1.1399
diff -u -b -r1.1398 -r1.1399
--- distrib/ChangeLog   22 Oct 2009 19:54:49 -0000      1.1398
+++ distrib/ChangeLog   22 Oct 2009 19:56:42 -0000      1.1399
@@ -15,6 +15,8 @@
 =========
 
 2009/10/22
+6772: New option max_result_name_len, shortens strings in
+      HTML/Telnet search results
 6958: EDK: Fix server connects on Solaris due to missing SO_KEEPALIVE
 6957: Configure: Make Ocaml 3.11.1 the default compiler
 6956; BT: Fix download of torrent files with no 'announce' field (Hose Bag)

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- src/daemon/common/commonOptions.ml  24 Feb 2009 18:35:46 -0000      1.227
+++ src/daemon/common/commonOptions.ml  22 Oct 2009 19:56:42 -0000      1.228
@@ -1499,6 +1499,10 @@
   "The size long names will be shortened to in the interface"
     int_option 50
 
+let max_result_name_len = define_expert_option current_section 
["max_result_name_len"]
+  "The size filenames will be shortened to in search results"
+    int_option 50
+
 let max_filenames = define_expert_option current_section ["max_filenames"]
   "The maximum number of different filenames used by MLDonkey"
     int_option 50

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -b -r1.250 -r1.251
--- src/daemon/driver/driverCommands.ml 28 Feb 2009 19:40:34 -0000      1.250
+++ src/daemon/driver/driverCommands.ml 22 Oct 2009 19:56:42 -0000      1.251
@@ -2139,6 +2139,7 @@
                        strings_of_option comments_filter;
                        strings_of_option max_displayed_results;
                        strings_of_option max_name_len;
+                       strings_of_option max_result_name_len;
                        strings_of_option max_filenames;
                        strings_of_option max_client_name_len;
                        strings_of_option emule_mods_count;

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- src/daemon/driver/driverInteractive.ml      17 Jul 2008 18:34:57 -0000      
1.138
+++ src/daemon/driver/driverInteractive.ml      22 Oct 2009 19:56:43 -0000      
1.139
@@ -1295,10 +1295,10 @@
                 match r.result_names with
                   [] -> ()
                 | name :: names ->
-                    Printf.bprintf buf "%s\n" (shorten name !!max_name_len);
+                    Printf.bprintf buf "%s\n" (shorten name 
!!max_result_name_len);
                     List.iter (fun s ->
                         if use_html_mods o then Printf.bprintf buf "\\<BR\\>";
-                        Printf.bprintf buf "       %s\n" (shorten s 
!!max_name_len)
+                        Printf.bprintf buf "       %s\n" (shorten s 
!!max_result_name_len)
                     ) names;
               end;
               if r.result_done then
@@ -1630,7 +1630,7 @@
                           if o.conn_output = HTML then Buffer.add_string buf 
"\\</table\\>\n";
 
                           Buffer.contents buf
-                    ) !!max_name_len)
+                    ) !!max_result_name_len)
                   (if o.conn_output = HTML then
                       begin
                         if !!html_mods then "\\</a\\>\\</td\\>"