--- web/cgi-bin/cvslog.cgi 2001/03/09 00:22:30 1.1 +++ web/cgi-bin/cvslog.cgi 2003/05/12 13:25:32 1.24 @@ -1,47 +1,171 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w -print "Content-type: text/html\n\n"; +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($today) = `date \"+%Y/%m/%d\"`; -my($cvs2clpath) = "/home/cut/tdb1/bin/cvs2cl"; -my($cvsroot) = "/usr/local/proj/co600_10/cvs"; -my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$today'\" -g \"-d$cvsroot\" -g \"-Q\""; -my($cmd) = "cd /home/cut/tdb1/cvsscripttemp && $cvs2clpath $cvs2clargs *"; +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$moduleext commits in the past $days day(s)"; + $days--; + $firstdate = ">" . `date --date \"$days days ago\" \"+%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$moduleext commits this week"; +} +else { + # default to "today only" + $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`; + $heading = "Today's i-scream CVS$moduleext commits"; +} -my(@lines) = `$cmd`; +my($cvsroot) = "/cvs/i-scream"; +$modulelist = `ls $cvsroot` unless defined $modulelist; +$modulelist =~ s/[\r\n]/ /gm; + +my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl"; +#my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; +my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; +my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; +my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; + +my ($left) = "../left.inc" ; +my ($title) = "../title.inc"; +my ($bottom) = "../bottom.inc"; + +print "Content-type: text/html\n\n"; + print <<"END"; - The i-scream Project Logfile Tailer - - - + The i-scream Project Commit Log - + - + + + + + +
+END -

Today's i-scream CVS commits

+&print_html($left); -Browse i-scream CVS repository +print <<"END"; +
+END -
+&print_html($title);
+
+print <<"END";
+

$heading

END -foreach my $line (@lines) { - print HTML_encode($line); +print `$updatecmd >/dev/null 2>&1`; + +my(@modules) = split (/\s+/, $modulelist); + +foreach my $module (@modules) { + + print "\n\n"; + print "\n\n"; + print "\n"; + + print "
\n$module module\n
\n"; + + my(@lines) = `$logcmd $module 2>&1`; + if(@lines == 0) { + print "There have been no commits in this module during this period.\n"; + } + else { + foreach my $line (@lines) { + + if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { + print "\n\n"; + print HTML_encode($1); + print "\n"; + print " commited by "; + print HTML_encode("$2"); + print "\n\n" + } + elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) { + print "\n\n"; + print HTML_encode($1); + print "\n"; + print " commited by "; + print HTML_encode("$2"); + print "\n\n" + } + elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { + #chop $line; + my ($file, $rest, $ext) = ($1, $2, $3); + print ""; + print ""; + print HTML_encode($file); + print " "; + if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { + my $newrev = "$1.$2"; + my $oldminver = $2-1; + my $oldrev = "$1.$oldminver"; + if($2 != 1) { + my $diff = ".diff?r1=$oldrev&r2=$newrev"; + print "("; + print HTML_encode("$1.$2"); + print ""; + print HTML_encode("$3)"); + } + else { + print HTML_encode($rest); + } + } + else { + print HTML_encode($rest); + } + print HTML_encode($ext); + print "
\n" + } + else { + chop $line; + print ""; + print HTML_encode($line); + print "
\n" + } + } + } + print "

\n\n"; } +&print_html($bottom); + print <<"END"; -

+ +
+ @@ -64,3 +188,8 @@ sub HTML_encode ($){ return $encoded; } +# Print a file without escaping HTML: - +sub print_html ($) { + my ($filename) = @_; + print `cat $filename 2>&1`; +}