--- web/cgi-bin/cvslog.cgi 2001/06/13 17:36:35 1.12 +++ web/cgi-bin/cvslog.cgi 2004/03/21 23:59:32 1.30 @@ -1,79 +1,101 @@ #!/usr/bin/perl -w +# TODO: remove tables, and use CSS instead + use CGI; $query=new CGI; my($period)=$query->param('period'); $period = "today" unless defined $period; +my($modulelist)=$query->param('module'); +my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist; 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)"; + $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; + $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; + $heading = "i-scream CVS$moduleext commits since $date"; + $firstdate = ">$date"; +} elsif($period eq "thisweek") { - $firstdate = "last Sunday"; - $heading = "i-scream CVS commits this week"; + $firstdate = ">last Sunday"; + $heading = "i-scream CVS$moduleext commits this week"; } else { - # default to "today only" - $firstdate = `/bin/date \"+%Y/%m/%d\"`; - $heading = "Today's i-scream CVS commits"; + # default to "today only" + $firstdate = ">" . `/bin/date +%Y/%m/%d`; + $heading = "Today's i-scream CVS$moduleext commits"; } my($cvsroot) = "/cvs/i-scream"; -my($modulelist)=$query->param('module'); $modulelist = `ls $cvsroot` unless defined $modulelist; +$modulelist =~ s/[\r\n]/ /gm; -my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl"; -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 $modulelist"; -my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; -my($leftinc) = "/home/sites/www.i-scream.org.uk/web/left.inc"; +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 ($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"; - +
-
+
+
END
-print `$leftinc`;
-print <<"END";
- |
-
+&print_html($header);
+print <<"END";
+
+ ";
- i-scream CVS Commit Logs- -$heading- END -print `$updatecmd`; +print `$updatecmd >/dev/null 2>&1`; my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { print "
\n\n"; } -print <<"END"; +print " |
-