--- web/cgi-bin/cvslog.cgi 2001/06/13 15:29:51 1.9
+++ web/cgi-bin/cvslog.cgi 2003/05/18 19:04:39 1.26
@@ -4,34 +4,56 @@ use CGI;
$query=new CGI;
my($period)=$query->param('period');
$period = "today" unless defined $period;
+my($modulelist)=$query->param('module');
+my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist;
my($firstdate);
if($period eq "days") {
my($days)=$query->param('days');
$days = 1 unless defined $days;
if ($days < 1) {$days = 1};
- $heading = "i-scream CVS commits in the past $days day(s)";
+ $heading = "i-scream CVS$moduleext commits in the past $days day(s)";
$days--;
- $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
+ $firstdate = ">" . `/bin/date -v-${days}d +%Y/%m/%d`;
}
+elsif($period eq "date") {
+ my($date)=$query->param('date');
+ $date = `/bin/date +%Y/%m/%d` unless defined $date;
+ $heading = "i-scream CVS$moduleext commits on $date";
+ $firstdate = "$date 00:00<$date 23:59"
+}
+elsif($period eq "since") {
+ my($date)=$query->param('date');
+ $date = `/bin/date +%Y/%m/%d` unless defined $date;
+ $heading = "i-scream CVS$moduleext commits since $date";
+ $firstdate = ">$date";
+}
elsif($period eq "thisweek") {
- $firstdate = "last Sunday";
- $heading = "i-scream CVS commits this week";
+ $firstdate = ">last Sunday";
+ $heading = "i-scream CVS$moduleext commits this week";
}
else {
- # default to "today only"
- $firstdate = `/bin/date \"+%Y/%m/%d\"`;
- $heading = "Today's i-scream CVS commits";
+ # default to "today only"
+ $firstdate = ">" . `/bin/date +%Y/%m/%d`;
+ $heading = "Today's i-scream CVS$moduleext commits";
}
-print "Content-type: text/html\n\n";
-
-my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
my($cvsroot) = "/cvs/i-scream";
-my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
-my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh";
-my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
+$modulelist = `ls $cvsroot` unless defined $modulelist;
+$modulelist =~ s/[\r\n]/ /gm;
+
+my($cvs2clpath) = "/usr/local/bin/cvs2cl";
+my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
+my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
+
+my ($left) = "../htdocs/left.inc" ;
+my ($title) = "../htdocs/title.inc";
+my ($bottom) = "../htdocs/bottom.inc";
+
+print "Content-type: text/html\n\n";
+
print <<"END";
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -41,25 +63,34 @@ print <<"END";
<title>The i-scream Project Commit Log</title>
</head>
-<body bgcolor="#ffffff" link="#ffffff" alink="#ffffff" vlink="#ffffff" text="#000066">
+<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
-<a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
+<table border="0" cellpadding="2" cellspacing="2">
+ <tr>
+ <td valign="top">
+END
-<h2>$heading</h2>
+&print_html($left);
+print <<"END";
+ </td>
+ <td valign="top">
END
-print `$updatecmd`;
+&print_html($title);
-my($modulelist)=$query->param('module');
-$modulelist = `ls $cvsroot` unless defined $modulelist;
+print <<"END";
+<h2>$heading</h2>
+END
+print `$updatecmd >/dev/null 2>&1`;
+
my(@modules) = split (/\s+/, $modulelist);
foreach my $module (@modules) {
- print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">";
- print "<tr><td><font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">$module module</a></b></font></td></tr>";
+ print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
+ print "<tr><td>\n<font size=\"4\"><b><a href=\"http://cvs.i-scream.org/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n";
print "<tr><td bgcolor=\"white\">\n";
my(@lines) = `$logcmd $module 2>&1`;
@@ -69,18 +100,65 @@ foreach my $module (@modules) {
else {
foreach my $line (@lines) {
- if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
- print "<font color=\"blue\"><b>";
+ if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
+ print "\n<font color=\"blue\">\n<b>";
print HTML_encode($1);
- print "</b><i>";
- print HTML_encode("by $2");
- print "</i></font>"
+ print "</b>\n<i>";
+ print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
+ print HTML_encode("$2");
+ print "</a></i>\n</font>\n"
}
+ elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) {
+ print "\n<font color=\"blue\">\n<b>";
+ print HTML_encode($1);
+ print "</b>\n<i>";
+ print " commited by ";
+ print HTML_encode("$2");
+ print "</i>\n</font>\n"
+ }
+ elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
+ my ($file, $rest, $ext) = ($1, $2, $3);
+ print "<code>";
+ print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
+ print HTML_encode($file);
+ print "</a> ";
+ if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
+ my $start = $1;
+ my $end = $2;
+ my $other = $3;
+ my $newrev = "$start.$end";
+ my $oldrev;
+ if($end != 1) {
+ my $oldminver = $end-1;
+ $oldrev = "$start.$oldminver";
+ }
+ elsif($start =~ /^((\d+\.)+)(\d+)$/) {
+ $oldrev = $1;
+ # take trailing . off old revision
+ chop $oldrev;
+ }
+ if(defined $oldrev) {
+ my $diff = ".diff?r1=$oldrev&r2=$newrev";
+ print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
+ print HTML_encode("$start.$end");
+ print "</a>";
+ print HTML_encode("$other)");
+ }
+ else {
+ print HTML_encode($rest);
+ }
+ }
+ else {
+ print HTML_encode($rest);
+ }
+ print HTML_encode($ext);
+ print "</code><br>\n"
+ }
else {
chop $line;
print "<code>";
print HTML_encode($line);
- print "</code><br>"
+ print "</code><br>\n"
}
}
}
@@ -89,8 +167,14 @@ foreach my $module (@modules) {
print "</table><p>\n\n";
}
+&print_html($bottom);
+
print <<"END";
+ </td>
+ </tr>
+</table>
+
</body>
</html>
@@ -111,4 +195,10 @@ sub HTML_encode ($){
$encoded =~ s/</</g;
$encoded =~ s/>/>/g;
return $encoded;
+}
+
+# Print a file without escaping HTML: -
+sub print_html ($) {
+ my ($filename) = @_;
+ print `cat $filename 2>&1`;
}