[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
Date: |
Mon, 02 Apr 2007 18:53:33 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/04/02 18:53:33
Modified files:
distrib : ChangeLog
src/daemon/common: commonMessages.ml commonStats.ml
src/daemon/driver: driverCommands.ml
src/utils/cdk : printf2.ml printf2.mli
Log message:
patch #5844
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1218&r2=1.1219
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonStats.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.224&r2=1.225
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/printf2.ml?cvsroot=mldonkey&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/printf2.mli?cvsroot=mldonkey&r1=1.9&r2=1.10
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1218
retrieving revision 1.1219
diff -u -b -r1.1218 -r1.1219
--- distrib/ChangeLog 1 Apr 2007 13:11:52 -0000 1.1218
+++ distrib/ChangeLog 2 Apr 2007 18:53:33 -0000 1.1219
@@ -14,6 +14,9 @@
ChangeLog
=========
+2007/04/02:
+5844: HTML: Keep totals line when sorting statistics tables (schlumpf)
+-------------------------------------------------------------------------------
2007/04/01: version 2.8.4 = tag release-2-8-4
5840: Some small stuff (logging, code improvements)
5839: IP block: Scan all files inside a .zip file when loading
Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/daemon/common/commonMessages.ml 11 Mar 2007 17:37:48 -0000 1.65
+++ src/daemon/common/commonMessages.ml 2 Apr 2007 18:53:33 -0000 1.66
@@ -440,10 +440,10 @@
this.s = s;
this.ar = ar;
}
-function _tabCreateArray(obj,st){
+function _tabCreateArray(obj,st,total){
var tb=obj.parentNode.parentNode;
var rw=obj.parentNode.parentNode.rows;
- var _nRows=rw.length;
+ var _nRows=rw.length-total;
var _tabS=new Array(_nRows-1);
var _nCells = rw.item(0).cells.length;
for(var i=1;i<_nRows;i++){
@@ -493,10 +493,10 @@
if (isNaN(parseFloat(b.s))) {return -1;}
return (parseFloat(b.s) - parseFloat(a.s));
}
-function _tabSort(obj,st){
+function _tabSort(obj,st,total){
if (_tabLast==obj) {_tabMode=!(_tabMode);}
else {_tabMode=true;}
- _tabCreateArray(obj,st);
+ _tabCreateArray(obj,st,total);
_tabLast=obj;
return _tabMode;
}
Index: src/daemon/common/commonStats.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonStats.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/daemon/common/commonStats.ml 6 Mar 2007 19:31:26 -0000 1.6
+++ src/daemon/common/commonStats.ml 2 Apr 2007 18:53:33 -0000 1.7
@@ -320,7 +320,7 @@
let stats_html_header buf =
- html_mods_table_header buf "csTable" "cs" [
+ html_mods_table_header buf ~total:"1" "csTable" "cs" [
( "0", "srh", "Client brand", "Brand" );
( "0", "srh", "Separator", ":" );
( "1", "srh ar", "Successful connections", "Seen" );
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- src/daemon/driver/driverCommands.ml 8 Mar 2007 21:01:02 -0000 1.224
+++ src/daemon/driver/driverCommands.ml 2 Apr 2007 18:53:33 -0000 1.225
@@ -1145,7 +1145,7 @@
let t2 = Printf.sprintf "Total uptime: %s" (Date.time_to_string u2
"verbose") in
html_mods_big_header_start buf "shares" [t1;t2];
- html_mods_table_header buf "sharesTable" "shares" [
+ html_mods_table_header buf ~total:"1" "sharesTable" "shares" [
( "0", "srh", "Country name", "Country" ) ;
( "0", "srh", "Country code", "Code" ) ;
( "0", "srh", "Continent", "Con" ) ;
@@ -1186,20 +1186,20 @@
cts := !cts ++ cs.country_total_seen;
end
) (List.sort (fun c1 c2 -> compare c1.country_code
c2.country_code) !!CommonStats.country_stats);
- Printf.bprintf buf "\\</tr\\>\n";
+ Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>"
(html_mods_cntr ());
html_mods_td buf [ (* Display totals *)
- ("", "sr", "Total");
- ("", "sr", "");
- ("", "sr", "");
- ("", "sr ar", size_of_int64 !csu);
- ("", "sr ar", size_of_int64 !csd);
- ("", "sr ar", Printf.sprintf "%Ld" !css);
- ("", "sr ar", size_of_int64 !ctu);
- ("", "sr ar", size_of_int64 !ctd);
- ("", "sr ar", Printf.sprintf "%Ld" !cts);
+ ("", "sr total", "Total");
+ ("", "sr total", "");
+ ("", "sr total", "");
+ ("", "sr ar total", size_of_int64 !csu);
+ ("", "sr ar total", size_of_int64 !csd);
+ ("", "sr ar total", Printf.sprintf "%Ld" !css);
+ ("", "sr ar total", size_of_int64 !ctu);
+ ("", "sr ar total", size_of_int64 !ctd);
+ ("", "sr ar total", Printf.sprintf "%Ld" !cts);
];
- Printf.bprintf buf "\\</tr\\>\n"
+ Printf.bprintf buf
"\\</tr\\>\\</table\\>\\</td\\>\\</tr\\>\\</table\\>\n"
end
else
begin
@@ -1257,7 +1257,7 @@
];
Printf.bprintf buf "\\</tr\\>\n"
) Geoip.country_code_array;
- Printf.bprintf buf "\\</tr\\>\n";
+ Printf.bprintf buf "\\</table\\>\n";
end
else
begin
@@ -3971,7 +3971,7 @@
if o.conn_output = HTML then
List.iter (fun (tablename, l) ->
html_mods_cntr_init ();
- html_mods_table_header buf tablename "servers" [
+ html_mods_table_header buf ~total:"1" tablename "servers" [
( "0", "srh ac br", "Description (" ^ tablename ^ ")", "Description
(" ^ tablename ^ ")") ;
( "0", "srh ac br", "Hits", "Hits") ;
( "0", "srh ac", "Range", "Range")];
Index: src/utils/cdk/printf2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/printf2.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/utils/cdk/printf2.ml 9 Nov 2006 21:32:27 -0000 1.21
+++ src/utils/cdk/printf2.ml 2 Apr 2007 18:53:33 -0000 1.22
@@ -301,7 +301,7 @@
*)
-let html_mods_table_header buf n c l =
+let html_mods_table_header buf ?(total = "0") n c l =
(* Name Class List *)
Printf.bprintf buf "\\<div class=\\\"%s\\\"\\>\\<table id=\\\"%s\\\"
name=\\\"%s\\\" class=\\\"%s\\\" cellspacing=0 cellpadding=0\\>"
c n n c;
@@ -309,21 +309,21 @@
Printf.bprintf buf "\\<tr\\>";
List.iter (fun (w,x,y,z) ->
(* Sort Class Title Value *)
- Printf.bprintf buf "\\<td onClick=\\\"_tabSort(this,%s);\\\"
class=\\\"%s\\\" title=\\\"%s\\\"\\>%s\\</td\\>"
- w x y z;
+ Printf.bprintf buf "\\<td onClick=\\\"_tabSort(this,%s,%s);\\\"
class=\\\"%s\\\" title=\\\"%s\\\"\\>%s\\</td\\>"
+ w total x y z;
) l;
Printf.bprintf buf "\\</tr\\>"
end
(* Add colspan functionality to html_mods_table_header *)
-let html_mods_table_header_colspan buf n c l =
+let html_mods_table_header_colspan buf ?(total="0") n c l =
(* Name Class List *)
Printf.bprintf buf "\\<div class=\\\"%s\\\"\\>\\<table id=\\\"%s\\\"
name=\\\"%s\\\" class=\\\"%s\\\" cellspacing=0 cellpadding=0\\>\\<tr\\>"
c n n c;
List.iter (fun (v,w,x,y,z) ->
(* Sort Class Title Value *)
- Printf.bprintf buf "\\<td colspan=%s onClick=\\\"_tabSort(this,%s);\\\"
class=\\\"%s\\\" title=\\\"%s\\\"\\>%s\\</td\\>"
- v w x y z;
+ Printf.bprintf buf "\\<td colspan=%s
onClick=\\\"_tabSort(this,%s,%s);\\\" class=\\\"%s\\\"
title=\\\"%s\\\"\\>%s\\</td\\>"
+ v w total x y z;
) l;
Printf.bprintf buf "\\</tr\\>"
Index: src/utils/cdk/printf2.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/printf2.mli,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/utils/cdk/printf2.mli 9 Nov 2006 21:32:27 -0000 1.9
+++ src/utils/cdk/printf2.mli 2 Apr 2007 18:53:33 -0000 1.10
@@ -48,8 +48,8 @@
val html_mods_big_header_start : Buffer.t -> string -> string list -> unit
val html_mods_big_header_end : Buffer.t -> unit
val html_mods_commands : Buffer.t -> string -> string -> (string * string *
string * string) list -> unit
-val html_mods_table_header : Buffer.t -> string -> string -> (string * string
* string * string) list -> unit
-val html_mods_table_header_colspan : Buffer.t -> string -> string -> (string *
string * string * string * string) list -> unit
+val html_mods_table_header : Buffer.t -> ?total:string -> string -> string ->
(string * string * string * string) list -> unit
+val html_mods_table_header_colspan : Buffer.t -> ?total:string -> string ->
string -> (string * string * string * string * string) list -> unit
val html_mods_table_no_header : Buffer.t -> string -> string -> (string *
string * string) list -> unit
val html_mods_table_one_row : Buffer.t -> string -> string -> (string * string
* string) list -> unit
val html_mods_table_one_col : Buffer.t -> string -> string -> (string * string
* string) list -> unit
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/02
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/10
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/10
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/13
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2007/04/19