--- web/cgi-bin/cvslog.cgi 2001/06/15 16:11:17 1.15 +++ web/cgi-bin/cvslog.cgi 2001/06/18 15:19:37 1.16 @@ -4,33 +4,40 @@ 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 "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"; } my($cvsroot) = "/cvs/i-scream"; -my($modulelist)=$query->param('module'); $modulelist = `ls $cvsroot` unless defined $modulelist; -my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl"; -my($cvs2clargs) = "--stdout -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; +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"; @@ -86,12 +93,40 @@ foreach my $module (@modules) { else { foreach my $line (@lines) { - if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) { - print "\n"; + if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { + print "\n\n"; print HTML_encode($1); - print ""; - print HTML_encode("by $2"); - print "\n" + 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;