diff --git a/source/tools/autolog/SVNLog/config.yml b/source/tools/autolog/SVNLog/config.yml index 907ec25b66..8ef71a162c 100644 --- a/source/tools/autolog/SVNLog/config.yml +++ b/source/tools/autolog/SVNLog/config.yml @@ -2,10 +2,10 @@ name: SVNLog svn: username: philip password: ???????? - url : http://artificetech.co.uk/svn/trunk + url : http://svn.0ad.homeip.net/svn/ps/trunk cdbi: dsn : dbi:SQLite:/var/www/svnlog/SVNLog/sql/svnlog.db scp: command : /usr/bin/scp -i /var/www/svnlog/ssh/wfgkey filename: philip@wildfiregames.com:~/svnlog/public - filename_feed: philip@wildfiregames.com:~/svnlog/public_feed + filename_feed: philip@wildfiregames.com:~/public_html/svnlog.xml diff --git a/source/tools/autolog/SVNLog/lib/SVNLog/Controller/LogUpdate.pm b/source/tools/autolog/SVNLog/lib/SVNLog/Controller/LogUpdate.pm index c5953458dd..23e39cbb4d 100644 --- a/source/tools/autolog/SVNLog/lib/SVNLog/Controller/LogUpdate.pm +++ b/source/tools/autolog/SVNLog/lib/SVNLog/Controller/LogUpdate.pm @@ -110,14 +110,18 @@ sub createfeed : Local sub generate_text { - my @logentries = SVNLog::Model::CDBI::Logentry->recent(7); + #my @logentries = SVNLog::Model::CDBI::Logentry->recent(7); + #my $maxentries = 0; # unlimited - my $out = qq{Atom feed}; + my @logentries = SVNLog::Model::CDBI::Logentry->recent(28); + my $maxentries = 10; + + my $out = qq{Atom feed\n}; for (@logentries) { my ($revision, $author, $date, $msg) = ($_->revision, $_->author, $_->date, $_->public_msg); next unless defined $msg and $msg->msg; - + $date =~ s/T.*Z//; $out .= <revision: $revision
@@ -129,7 +133,9 @@ EOF $text =~ s//>/g; $text =~ s/\n/
/g; - $out .= $text . '
'; + $out .= $text . "\n
\n"; + + last if --$maxentries == 0; } $out ||= 'Sorry, no data is available right now.'; diff --git a/source/tools/autolog/SVNLog/root/PublicMessage/list.tt b/source/tools/autolog/SVNLog/root/PublicMessage/list.tt index 00ff8dd4f6..c7dd906f70 100644 --- a/source/tools/autolog/SVNLog/root/PublicMessage/list.tt +++ b/source/tools/autolog/SVNLog/root/PublicMessage/list.tt @@ -4,6 +4,7 @@ Revision Author + Date Log message Public message @@ -16,6 +17,8 @@ [% object.logentry.revision %] [% object.logentry.author %] + [% str = object.logentry.date.match('(\d{4}-\d{2}-\d{2}).(\d{2}:\d{2}:\d{2})'); + str.0 %] [% str.1 %] [% object.logentry.msg | html | html_line_break %] [% object.msg | html | html_line_break %]