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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/28 11:56:12

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

Log message:
        patch #5591

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1115&r2=1.1116
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.60&r2=1.61

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1115
retrieving revision 1.1116
diff -u -b -r1.1115 -r1.1116
--- distrib/ChangeLog   26 Nov 2006 17:27:40 -0000      1.1115
+++ distrib/ChangeLog   28 Nov 2006 11:56:11 -0000      1.1116
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/11/28
+5591: EDK: Fix small file search result parsing
+
 2006/11/26
 5590: EDK: .gz & .bz2 support for command "servers"
 5581: EDK: Improve server logins, send fewer data, minor improvements

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- src/daemon/driver/driverInteractive.ml      26 Nov 2006 13:54:09 -0000      
1.116
+++ src/daemon/driver/driverInteractive.ml      28 Nov 2006 11:56:12 -0000      
1.117
@@ -1181,8 +1181,10 @@
   match tag.tag_value with
  | Uint64 i -> String.escaped (Int64.to_string i)
  | Fint64 i -> String.escaped (Int64.to_string i)
+ | Uint16 i | Uint8 i -> String.escaped (string_of_int i)
  | String s -> String.escaped s
- | _ -> ""
+ | Addr i -> Ip.to_string i
+ | Pair (x,y) -> Printf.sprintf "%Ld, %Ld" x y
 
 let old_print_search buf o results =
   let user = o.conn_user in

Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- src/networks/donkey/donkeyComplexOptions.ml 26 Nov 2006 16:36:29 -0000      
1.60
+++ src/networks/donkey/donkeyComplexOptions.ml 28 Nov 2006 11:56:12 -0000      
1.61
@@ -555,8 +555,10 @@
       match tag with
         { tag_name = Field_Filename; tag_value = String s } ->
           r.result_names <- s :: r.result_names
-      | { tag_name = Field_Size; tag_value = Uint64 v } ->
+      | { tag_name = Field_Size; tag_value = (Uint64 v| Fint64 v) } ->
           r.result_size <- v;
+      | { tag_name = Field_Size; tag_value = (Uint16 v| Uint8 v) } ->
+          r.result_size <- Int64.of_int v;
       | { tag_name = Field_Format; tag_value = String s } ->
           r.result_tags <- tag :: r.result_tags;
           r.result_format <- s