--- web/cgi-bin/cvslog.cgi 2003/05/13 15:18:13 1.23.2.5 +++ web/cgi-bin/cvslog.cgi 2003/09/27 17:42:45 1.29 @@ -14,8 +14,7 @@ if($period eq "days") { if ($days < 1) {$days = 1}; $heading = "i-scream CVS$moduleext commits in the past $days day(s)"; $days--; - $days .= "d"; # because we can't write "$daysd" below :-) - $firstdate = ">" . `/bin/date -v-$days +%Y/%m/%d`; + $firstdate = ">" . `/bin/date -v-${days}d +%Y/%m/%d`; } elsif($period eq "date") { my($date)=$query->param('date'); @@ -45,7 +44,7 @@ $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($cvs2clargs) = "--stdout --no-wrap --no-common-dir -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"; @@ -105,7 +104,7 @@ foreach my $module (@modules) { print "\n\n"; print HTML_encode($1); print "\n"; - print " commited by "; + print " committed by "; print HTML_encode("$2"); print "\n\n" } @@ -113,17 +112,17 @@ foreach my $module (@modules) { print "\n\n"; print HTML_encode($1); print "\n"; - print " commited by "; + print " committed by "; print HTML_encode("$2"); print "\n\n" } - elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { - my ($file, $rest, $ext) = ($1, $2, $3); + elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) { + my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4); print ""; print ""; print HTML_encode($file); print " "; - if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { + if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) { my $start = $1; my $end = $2; my $other = $3; @@ -146,17 +145,17 @@ foreach my $module (@modules) { print HTML_encode("$other)"); } else { - print HTML_encode($rest); + print HTML_encode($rev); } } else { - print HTML_encode($rest); + print HTML_encode($rev); } print HTML_encode($ext); print "
\n" } else { - chop $line; + chomp $line; print ""; print HTML_encode($line); print "
\n"