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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/19 00:44:47

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonResult.ml commonSearch.ml 
        src/daemon/driver: driverInteractive.ml 
        src/networks/donkey: donkeyMftp.ml donkeyMftp.mli 

Log message:
        patch #4810

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.680&tr2=1.681&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonResult.ml.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonSearch.ml.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMftp.ml.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMftp.mli.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.680 mldonkey/distrib/ChangeLog:1.681
--- mldonkey/distrib/ChangeLog:1.680    Mon Jan 16 16:09:10 2006
+++ mldonkey/distrib/ChangeLog  Thu Jan 19 00:44:47 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/01/19
+4810: Update search results with highest avail/completesources tags (zet)
+
 2006/01/16
 4803: BT: force uniqueness of added trackers by "trackers" command (pango)
 4801: EDK: add more server info fields (html and guiprot) (zet)
Index: mldonkey/src/daemon/common/commonResult.ml
diff -u mldonkey/src/daemon/common/commonResult.ml:1.6 
mldonkey/src/daemon/common/commonResult.ml:1.7
--- mldonkey/src/daemon/common/commonResult.ml:1.6      Tue Dec  6 19:34:04 2005
+++ mldonkey/src/daemon/common/commonResult.ml  Thu Jan 19 00:44:47 2006
@@ -53,9 +53,31 @@
       r.result_names <- r.result_names @ [name]
     end
 
+let int64_of_tagvalue v = 
+  match v with 
+   | Uint64 n -> n
+   | _ -> 0L
+
+(* Update specific tags to highest value *)
+let rec find_tag2 new_tag tags =
+  match tags with
+    [] -> raise Not_found
+  | tag :: tail -> begin
+    match tag with 
+      { tag_name = (Field_Availability | Field_Completesources); tag_value = 
tag_value } 
+        when tag.tag_name = new_tag.tag_name ->
+            let x = int64_of_tagvalue tag_value in
+            let y = int64_of_tagvalue new_tag.tag_value in
+            if y > x then tag.tag_value <- Uint64 y;
+            true
+    | { tag_name = tag_name; tag_value = _ } when tag_name = new_tag.tag_name 
-> false
+    | _ -> find_tag2 new_tag tail
+  end
+
 let set_result_tag r tag =
   try
-    ignore (CommonGlobals.find_tag tag.tag_name r.result_tags)
+    let updated = find_tag2 tag r.result_tags in
+    if updated then r.result_modified <- true;
   with Not_found ->
       r.result_modified <- true;
       r.result_tags <- r.result_tags @ [tag]
@@ -95,6 +117,7 @@
           let rr = IndexedResults.get_result rs in
           List.iter (set_result_name rr) r.result_names;
           List.iter (set_result_tag rr) r.result_tags;
+          IndexedResults.update_result rs rr;
           rs
         with Not_found -> iter tail
   in
Index: mldonkey/src/daemon/common/commonSearch.ml
diff -u mldonkey/src/daemon/common/commonSearch.ml:1.16 
mldonkey/src/daemon/common/commonSearch.ml:1.17
--- mldonkey/src/daemon/common/commonSearch.ml:1.16     Sun Oct 16 20:42:50 2005
+++ mldonkey/src/daemon/common/commonSearch.ml  Thu Jan 19 00:44:47 2006
@@ -60,7 +60,11 @@
 let search_add_result_in s r =
   try
     let (c,_) = Intmap.find r.stored_result_num s.search_results in
-    incr c
+    incr c;
+
+    let ri = IndexedResults.get_result r in 
+    if ri.result_modified then
+      List.iter (fun f -> f r) s.op_search_new_result_handlers
   with _ ->
       s.search_results <- Intmap.add r.stored_result_num (ref 1, r)
       s.search_results;
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.55 
mldonkey/src/daemon/driver/driverInteractive.ml:1.56
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.55        Wed Dec 28 
10:32:31 2005
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Thu Jan 19 00:44:47 2006
@@ -1080,7 +1080,7 @@
                     Printf.bprintf buf "%s\n" (shorten name !!max_name_len);
                     List.iter (fun s ->
                         if use_html_mods o then Printf.bprintf buf "\\<BR\\>";
-                        Printf.bprintf buf "       %s\n" s
+                        Printf.bprintf buf "       %s\n" (shorten s 
!!max_name_len)
                     ) names;
               end;
               if r.result_done then
Index: mldonkey/src/networks/donkey/donkeyMftp.ml
diff -u mldonkey/src/networks/donkey/donkeyMftp.ml:1.11 
mldonkey/src/networks/donkey/donkeyMftp.ml:1.12
--- mldonkey/src/networks/donkey/donkeyMftp.ml:1.11     Sun Oct 16 20:42:54 2005
+++ mldonkey/src/networks/donkey/donkeyMftp.ml  Thu Jan 19 00:44:47 2006
@@ -195,13 +195,6 @@
     val write: Buffer.t -> t -> unit
   end
   
-let rec find_tag v tags =
-  match tags with
-    [] -> raise Not_found
-  | { tag_name = tag_name; tag_value = tag_value } :: _ 
-    when tag_name = v -> tag_value
-  | _ :: tags -> find_tag v tags
-
 let file_common_tags = [
     "\001", Field_Filename;
     "\002", Field_Size;
Index: mldonkey/src/networks/donkey/donkeyMftp.mli
diff -u mldonkey/src/networks/donkey/donkeyMftp.mli:1.5 
mldonkey/src/networks/donkey/donkeyMftp.mli:1.6
--- mldonkey/src/networks/donkey/donkeyMftp.mli:1.5     Mon Nov  1 11:23:01 2004
+++ mldonkey/src/networks/donkey/donkeyMftp.mli Thu Jan 19 00:44:47 2006
@@ -51,6 +51,4 @@
     val print : t -> unit
     val write : Buffer.t -> t -> unit
   end
-val find_tag :  CommonTypes.field ->
-    CommonTypes.tag list -> CommonTypes.tag_value
 val file_common_tags : (string * CommonTypes.field) list
\ No newline at end of file