[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: |
Sun, 29 Jan 2006 18:44:18 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/29 18:44:18
Modified files:
distrib : ChangeLog
src/daemon/common: commonWeb.ml
src/daemon/driver: driverCommands.ml
Log message:
patch #4843
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.692&tr2=1.693&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonWeb.ml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.117&tr2=1.118&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.692 mldonkey/distrib/ChangeLog:1.693
--- mldonkey/distrib/ChangeLog:1.692 Sun Jan 29 18:42:53 2006
+++ mldonkey/distrib/ChangeLog Sun Jan 29 18:44:18 2006
@@ -15,6 +15,7 @@
=========
2006/01/29
+4843: HTML: Improve output of rss command
4842: Some logfile stuff
4841: Create new dir web_infos for web_infos files,
BT: do not save .torrent or announce.*
Index: mldonkey/src/daemon/common/commonWeb.ml
diff -u mldonkey/src/daemon/common/commonWeb.ml:1.25
mldonkey/src/daemon/common/commonWeb.ml:1.26
--- mldonkey/src/daemon/common/commonWeb.ml:1.25 Sun Jan 29 18:42:02 2006
+++ mldonkey/src/daemon/common/commonWeb.ml Sun Jan 29 18:44:18 2006
@@ -362,6 +362,7 @@
let _ =
add_web_kind "rss" (fun url filename ->
+ lprintf_nl "[cWeb=rss] parsing feed %s" url;
let c = Rss.channel_of_file filename in
(try Sys.remove filename with _ -> ());
let feed =
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.117
mldonkey/src/daemon/driver/driverCommands.ml:1.118
--- mldonkey/src/daemon/driver/driverCommands.ml:1.117 Thu Jan 26 10:34:52 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml Sun Jan 29 18:44:18 2006
@@ -2987,10 +2987,13 @@
let r = feed.CW.rss_value in
if o.conn_output = HTML then begin
Printf.bprintf buf "\\</pre\\>\\<div class=\\\"cs\\\"\\>";
- html_mods_table_header buf "rssTable" "results" [];
+ html_mods_table_header buf "rssTable" "results" [
+ ( "0", "sr", "Content", "Content" ) ;
+ ( "0", "sr", "MLDonkey Download", "Download" ) ];
Printf.bprintf buf "\\<tr\\>";
html_mods_td buf [
- (r.Rss.ch_title ^ " : " ^ url ^ (Printf.sprintf ", loaded %d
hours ago" (feed.CW.rss_date / 3600)), "srh", r.Rss.ch_title); ];
+ (r.Rss.ch_title ^ " : " ^ url ^ (Printf.sprintf ", loaded %d
hours ago" (((last_time ()) - feed.CW.rss_date) / 3600)), "srh",
r.Rss.ch_title);
+ ("", "srh", "") ];
Printf.bprintf buf "\\</tr\\>"
end
else begin
@@ -3007,7 +3010,11 @@
if o.conn_output = HTML then begin
Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>"
(html_mods_cntr ());
html_mods_td buf [
- (title, "sr", "\\<a href=\\\"submit?q=dllink+" ^
(Url.encode link) ^ "\\\"\\ title=\\\"" ^ link ^ "\\\"\\>" ^ title ^
"\\</a\\>"); ];
+ (title, "sr", "\\<a href=\\\"" ^ link ^ "\\\"\\>" ^
title ^ "\\</a\\>");
+ (title, "sr", "\\<a href=\\\"submit?q=dllink+" ^
(Url.encode link) ^
+ "\\\"\\ title=dllink\\\"\\>dllink\\</a\\> \\<a
href=\\\"submit?q=http+" ^
+ (Url.encode link) ^ "\\\"\\
title=http\\\"\\>http\\</a\\>")
+ ];
Printf.bprintf buf "\\</tr\\>"
end
else begin
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., (continued)
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/11
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/11
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/16
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/18
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/18
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29