--- web/cgi-bin/cvslog.cgi 2003/05/12 07:49:58 1.23.2.4 +++ web/cgi-bin/cvslog.cgi 2004/03/21 23:59:32 1.30 @@ -1,5 +1,7 @@ #!/usr/bin/perl -w +# TODO: remove tables, and use CSS instead + use CGI; $query=new CGI; my($period)=$query->param('period'); @@ -14,17 +16,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 +36,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"; } @@ -44,42 +46,45 @@ $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"; -my ($left) = "../htdocs/left.inc" ; -my ($title) = "../htdocs/title.inc"; -my ($bottom) = "../htdocs/bottom.inc"; +my ($menu) = "../nwww/menu.inc" ; +my ($header) = "../nwww/header.inc"; +my ($footer) = "../nwww/footer.inc"; +my ($style) = "../nwww/style.inc"; print "Content-type: text/html\n\n"; print <<"END"; - + - The i-scream Project Commit Log - - - - - - - - - -
+ i-scream CVS Commit Logs END -&print_html($left); +&print_html($style); print <<"END"; - + + + + +
+ +
END -&print_html($title); +&print_html($header); print <<"END"; +
+

i-scream CVS Commit Logs

+

$heading

END @@ -90,7 +95,7 @@ my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { print "\n\n"; - print "\n\n"; + print "\n\n"; print "
\n$module module\n
\n$module module\n
\n"; my(@lines) = `$logcmd $module 2>&1`; @@ -104,7 +109,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" } @@ -112,17 +117,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; @@ -145,20 +150,20 @@ 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" + print "
\n" } else { - chop $line; + chomp $line; print ""; print HTML_encode($line); - print "
\n" + print "
\n" } } } @@ -167,16 +172,18 @@ foreach my $module (@modules) { print "

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

"; -print <<"END"; +&print_html($footer); -
+print ""; - +&print_html($menu); +print <<"END"; + + + END