#!/usr/bin/perl -w
+# TODO: remove tables, and use CSS instead
+
use CGI;
$query=new CGI;
my($period)=$query->param('period');
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";
}
}
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";
}
$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 ($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";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
- <title>The i-scream Project Commit Log</title>
-</head>
-
-<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
-
-<table border="0" cellpadding="2" cellspacing="2">
- <tr>
- <td valign="top">
+ <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";
+<div id="contents">
+<h1 class="top">i-scream CVS Commit Logs</h1>
+
<h2>$heading</h2>
END
-print `$updatecmd`;
+print `$updatecmd >/dev/null 2>&1`;
my(@modules) = split (/\s+/, $modulelist);
foreach my $module (@modules) {
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>\n<font size=\"4\"><b><a href=\"http://cvs.i-scream.org/$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`;
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 " commit
ted by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
print HTML_encode("$2");
print "</a></i>\n</font>\n"
}
- elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
- #chop $line;
- my ($file, $rest, $ext) = ($1, $2, $3);
+ elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) {
+ print "\n<font color=\"blue\">\n<b>";
+ print HTML_encode($1);
+ print "</b>\n<i>";
+ print " committed by ";
+ print HTML_encode("$2");
+ print "</i>\n</font>\n"
+ }
+ elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) {
+ my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4);
print "<code>";
- print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
+ print "<a href=\"http://cvs.i-scream.org/$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)) {
+ 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";
- print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
- print HTML_encode($rest);
+ print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
+ print HTML_encode("$start.$end");
print "</a>";
+ 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 "</code><br>\n"
+ print "</code><br/>\n"
}
else {
- chop $line;
+ chomp $line;
print "<code>";
print HTML_encode($line);
- print "</code><br>\n"
+ print "</code><br/>\n"
}
}
}
print "</table><p>\n\n";
}
-&print_html($bottom);
+print "</div>";
-print <<"END";
+&print_html($footer);
- </td>
- </tr>
-</table>
+print "</div>";
-</body>
+&print_html($menu);
+print <<"END";
+</div>
+
+</body>
</html>
END
i-scream / www.i-scream.org.git / blobdiff