X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=fe62526d0e79a7428945677a83ce8eb4d1f0c46c;hb=dc1a4c45281a89afeef45f0dd14379766d941b73;hp=bb2dc3f7388ee882d955e28221baac44d388046e;hpb=5d49ad29be6b0bb4fdfdec65618ad42d7e0e4202;p=www.i-scream.org.git
diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index bb2dc3f..fe62526 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -1,15 +1,36 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+
+use CGI;
+$query=new CGI;
+my($period)=$query->param('period');
+$period = "today" unless defined $period;
+
+my($firstdate);
+if($period eq "days") {
+ my($days)=$query->param('days');
+ $days = 1 unless defined $days;
+ if ($days < 1) {$days = 1};
+ $heading = "i-scream CVS commits in the past $days day(s)";
+ $days--;
+ $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
+}
+elsif($period eq "thisweek") {
+ $firstdate = "last Sunday";
+ $heading = "i-scream CVS commits this week";
+}
+else {
+ # default to "today only"
+ $firstdate = `/bin/date \"+%Y/%m/%d\"`;
+ $heading = "Today's i-scream CVS commits";
+}
print "Content-type: text/html\n\n";
-my($today) = `date \"+%Y/%m/%d\"`;
-my($cvs) = "/home/cut/tdb1/bin/cvs";
-my($cvs2clpath) = "/home/cut/tdb1/bin/cvs2cl";
-my($cvsroot) = "/usr/local/proj/co600_10/cvs";
-my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$today'\" -g \"-d$cvsroot\" -g \"-Q\"";
-my($cmd) = "cd /home/cut/tdb1/cvsscripttemp && $cvs -d $cvsroot -Q update -d && $cvs2clpath $cvs2clargs *";
-
-my(@lines) = `$cmd 2>&1`;
+my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
+my($cvsroot) = "/cvs/i-scream";
+my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh";
+my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
print <<"END";
@@ -17,32 +38,58 @@ print <<"END";
- The i-scream Project Daily Commit Log
-
-
-
+ The i-scream Project Commit Log
-
+
-Today's i-scream CVS commits
+
+
-Browse i-scream CVS repository
-
-
END
-foreach my $line (@lines) {
- print HTML_encode($line);
+print `$updatecmd`;
+
+my $modulelist = `ls $cvsroot`;
+my(@modules) = split (/\s+/, $modulelist);
+
+foreach my $module (@modules) {
+
+ print "";
+ print "| $module module |
";
+ print "";
+
+ my(@lines) = `$logcmd $module 2>&1`;
+ if(@lines == 0) {
+ print "There have been no commits in this module during this period.";
+ }
+ else {
+ foreach my $line (@lines) {
+
+ if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
+ print "";
+ print HTML_encode($1);
+ print "";
+ print HTML_encode("by $2");
+ print ""
+ }
+ else {
+ chop $line;
+ print "";
+ print HTML_encode($line);
+ print "
"
+ }
+ }
+ }
+ print " |
";
+
+ print "
\n\n";
}
print <<"END";
-
+
@@ -64,4 +111,3 @@ sub HTML_encode ($){
$encoded =~ s/>/>/g;
return $encoded;
}
-