--- web/cgi-bin/cvslog.cgi 2003/05/12 13:25:32 1.24 +++ web/cgi-bin/cvslog.cgi 2003/08/21 22:22:12 1.27 @@ -14,17 +14,17 @@ if($period eq "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\"`; + $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; + $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; + $date = `/bin/date +%Y/%m/%d` unless defined $date; $heading = "i-scream CVS$moduleext commits since $date"; $firstdate = ">$date"; } @@ -34,7 +34,7 @@ elsif($period eq "thisweek") { } else { # default to "today only" - $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`; + $firstdate = ">" . `/bin/date +%Y/%m/%d`; $heading = "Today's i-scream CVS$moduleext commits"; } @@ -43,15 +43,14 @@ 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($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/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; -my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; +my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist"; +my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs"; -my ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; +my ($left) = "../htdocs/left.inc" ; +my ($title) = "../htdocs/title.inc"; +my ($bottom) = "../htdocs/bottom.inc"; print "Content-type: text/html\n\n"; @@ -91,7 +90,7 @@ my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { print "
\n$module module\n |
\n$module module\n |
\n";
my(@lines) = `$logcmd $module 2>&1`;
@@ -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,27 +112,37 @@ 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+\))([,:])/) {
- #chop $line;
my ($file, $rest, $ext) = ($1, $2, $3);
print "";
- 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 $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 "(";
- print HTML_encode("$1.$2");
+ print "(";
+ print HTML_encode("$start.$end");
print "";
- print HTML_encode("$3)");
+ print HTML_encode("$other)");
}
else {
print HTML_encode($rest);
|