--- web/cgi-bin/cvslog.cgi 2001/06/05 16:19:00 1.5 +++ web/cgi-bin/cvslog.cgi 2001/12/09 00:25:48 1.18 @@ -4,79 +4,158 @@ 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 = ">" . `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 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($cvs) = "/usr/bin/cvs"; -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'\>$today'\" -g \"-d$cvsroot\" -g \"-Q\""; -my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; -my($updatecmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs -d $cvsroot -Q update -d"; + +$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($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 Daily Commit Log + The i-scream Project Commit Log - + + + + + +
+END -

$heading

+&print_html($left); +print <<"END"; +
END +&print_html($title); + +print <<"END"; +

$heading

+END + print `$updatecmd`; -my $modulelist = `ls $cvsroot`; my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { - print "

$module module

\n"; - print ""; - print "Browse i-scream "$module" cvs module\n"; - print "
\n";
+    print "\n\n";
+    print "\n\n";
+    print "\n";
 
-    print "

\n\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."; + print "There have been no commits in this module during this period.\n"; } else { foreach my $line (@lines) { - print HTML_encode($line); + + 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 =~ /(\S+) (\(\S+\))([,:])/) { + #chop $line; + my ($file, $rest, $ext) = ($1, $2, $3); + print ""; + print ""; + print HTML_encode($file); + print " "; + if($rest =~ /\((\S).(\S+)\)/) { + my $newrev = "$1.$2"; + my $oldminver = $2-1; + my $oldrev = "$1.$oldminver"; + if(!($1==1 && $2==1)) { + my $diff = ".diff?r1=$oldrev&r2=$newrev"; + print ""; + print HTML_encode($rest); + print ""; + } + 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"; + +

+ @@ -97,4 +176,10 @@ sub HTML_encode ($){ $encoded =~ s//>/g; return $encoded; +} + +# Print a file without escaping HTML: - +sub print_html ($) { + my ($filename) = @_; + print `cat $filename 2>&1`; }