--- web/cgi-bin/cvslog.cgi 2001/12/09 00:25:48 1.18
+++ web/cgi-bin/cvslog.cgi 2004/03/24 21:08:09 1.32
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-use CGI;
+use CGI qw/:standard/;
$query=new CGI;
my($period)=$query->param('period');
$period = "today" unless defined $period;
@@ -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,143 +43,275 @@ 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($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($cvs2clpath) = "/usr/local/bin/cvs2cl";
+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) = "../left.inc" ;
-my ($title) = "../title.inc";
-my ($bottom) = "../bottom.inc";
+my ($incdir) = "../nwww";
-print "Content-type: text/html\n\n";
+# Include files
+my ($doctype) = "$incdir/doctype.inc";
+my ($style) = "$incdir/style.inc";
+my ($header) = "$incdir/header.inc";
+my ($footer) = "$incdir/footer.inc";
+my ($menu) = "$incdir/menu.inc" ;
-print <<"END";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+# Section markers
+my ($secwho) = 1;
+my ($secfiles) = 2;
+my ($seclog) = 3;
-<html>
+# This should be application/xhtml+xml
+print "Content-type: text/html\n\n";
-<head>
- <title>The i-scream Project Commit Log</title>
-</head>
+&print_html($doctype);
-<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
+print <<"END";
-<table border="0" cellpadding="2" cellspacing="2">
- <tr>
- <td valign="top">
+ <head>
+ <title>
+ i-scream CVS Commit Logs
+ </title>
END
-&print_html($left);
+&print_html($style);
print <<"END";
- </td>
- <td valign="top">
+
+ </head>
+ <body>
+ <div id="container">
+ <div id="main">
END
-&print_html($title);
+&print_html($header);
print <<"END";
-<h2>$heading</h2>
+
+ <div id="contents">
+ <h1 class="top">
+ i-scream CVS Commit Logs
+ </h1>
+ <h2>
+ $heading
+ </h2>
+ <div id="cvslog">
END
-print `$updatecmd`;
+print `$updatecmd >/dev/null 2>&1`;
my(@modules) = split (/\s+/, $modulelist);
foreach my $module (@modules) {
+ my($firstentry) = 1;
+ my($sec) = 0;
+ print <<"END";
+ <div>
+ <h3>
+ <a href="http://cvs.i-scream.org/$module/" class="cvsloghead">$module module</a>
+ </h3>
+END
- print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
- print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n";
- print "<tr><td bgcolor=\"white\">\n";
-
my(@lines) = `$logcmd $module 2>&1`;
if(@lines == 0) {
- print "There have been no commits in this module during this period.\n";
+ print <<"END";
+ <p>
+ There have been no commits in this module during this period.
+ </p>
+END
}
else {
+ my(@log) = ();
foreach my $line (@lines) {
- if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
- print "\n<font color=\"blue\">\n<b>";
- print HTML_encode($1);
- print "</b>\n<i>";
- print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
- print HTML_encode("$2");
- print "</a></i>\n</font>\n"
+ if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)(\s+<([^\s]+)>)?$/) {
+ my($datetime) = escapeHTML($1);
+ my($committer) = escapeHTML($2);
+ my($email) = $4;
+
+ if($sec != $secwho) {
+ if($sec == $seclog) {
+ @log = &trim_array(@log);
+ foreach my $logline (@log) {
+ $logline =~ s/^\t//;
+ print escapeHTML("$logline\n");
+ }
+ @log = ();
+ print <<"END";
+</pre>
+ </div>
+END
+ }
+ if($firstentry) {
+ $firstentry = 0;
+ print <<"END";
+ <div class="logitemfirst">
+END
+ }
+ else {
+ print <<"END";
+ <div class="logitem">
+END
+ }
+ $sec = $secwho;
+ }
+
+ print <<"END";
+ <p>
+ <b>
+ $datetime
+ </b>
+ committed by
+END
+ if(defined $email) {
+ print <<"END";
+ <a href="mailto:$email">$committer</a>
+END
+ }
+ else {
+ print <<"END";
+ $committer
+END
+ }
+ print <<"END";
+ </p>
+END
}
- elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
- #chop $line;
- my ($file, $rest, $ext) = ($1, $2, $3);
- print "<code>";
- print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
- print HTML_encode($file);
- print "</a> ";
- 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 "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
- print HTML_encode($rest);
- print "</a>";
+ elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) {
+ my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4);
+ $ext = escapeHTML($ext);
+ if($sec != $secfiles) {
+ $sec = $secfiles;
+ print <<"END";
+ <p>
+END
+ }
+ $file = escapeHTML($file);
+ print <<"END";
+ <a href="http://cvs.i-scream.org/$file">$file</a>
+END
+ if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) {
+ 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";
+ my $startend = escapeHTML("$start.$end");
+ $other = escapeHTML($other);
+ chomp $other;
+ print <<"END";
+ (<a href="http://cvs.i-scream.org/$file$diff">$startend</a>$other)$ext
+END
+ }
else {
- print HTML_encode($rest);
+ $rev = escapeHTML($rev);
+ print <<"END";
+ $rev$ext
+END
}
}
else {
- print HTML_encode($rest);
+ $rev = escapeHTML($rev);
+ print <<"END";
+ $rev$ext
+END
}
- print HTML_encode($ext);
- print "</code><br>\n"
+ if($ext !~ /:$/) {
+ print <<"END";
+ <br />
+END
+ }
}
else {
- chop $line;
- print "<code>";
- print HTML_encode($line);
- print "</code><br>\n"
+ next if $sec == $secwho; # not done secfiles yet
+ if($sec != $seclog) {
+ $sec = $seclog;
+ print <<"END";
+ </p>
+ <pre>
+END
+ }
+ chomp $line;
+ push(@log, $line);
}
}
+ if($sec == $seclog) {
+ @log = &trim_array(@log);
+ foreach my $logline (@log) {
+ $logline =~ s/^\t//;
+ print escapeHTML("$logline\n");
+ }
+ @log = ();
+ print <<"END";
+</pre>
+ </div>
+END
+ }
}
- print "</td></tr>\n";
-
- print "</table><p>\n\n";
+ print <<"END";
+ </div>
+END
}
-&print_html($bottom);
+print <<"END";
+ </div>
+ </div>
+END
+&print_html($footer);
+
print <<"END";
- </td>
- </tr>
-</table>
+ </div>
+END
-</body>
+&print_html($menu);
+print <<"END";
+
+ </div>
+ </body>
</html>
END
exit 0;
-#------------------------------------------------------
-# sub HTML_encode
-#
-# escape HTML characters that may cause problems when
-# shown either in the <body> or within text fields.
-#------------------------------------------------------
-sub HTML_encode ($){
- my ($encoded) = @_;
- $encoded =~ s/&/&/g;
- $encoded =~ s/"/"/g;
- $encoded =~ s/</</g;
- $encoded =~ s/>/>/g;
- return $encoded;
+# Print the contents of a file containing html
+sub print_html {
+ my ($filename) = @_;
+ open(FILE, $filename);
+ while(<FILE>) {
+ print;
+ }
+ close FILE;
}
-# Print a file without escaping HTML: -
-sub print_html ($) {
- my ($filename) = @_;
- print `cat $filename 2>&1`;
+# Trim an array (remove beginning and end emptry entries)
+sub trim_array {
+ my (@array) = @_;
+ for(my $i = 0; $i < scalar @array; $i++) {
+ if($array[$i] ne "") {
+ splice @array, 0, $i;
+ last;
+ }
+ }
+ for(my $i = scalar @array - 1; $i >= 0; $i--) {
+ if($array[$i] ne "") {
+ splice @array, $i+1;
+ last;
+ }
+ }
+ return @array;
}