--- web/cgi-bin/cvslog.cgi 2001/06/13 17:36:35 1.12 +++ web/cgi-bin/cvslog.cgi 2001/06/18 15:19:37 1.16 @@ -4,37 +4,47 @@ 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 = ">" . `date --date \"$days days ago\" \"+%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 "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; -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($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($leftinc) = "/home/sites/www.i-scream.org.uk/web/left.inc"; +my ($left) = "../left.inc" ; +my ($title) = "../title.inc"; +my ($bottom) = "../bottom.inc"; + print "Content-type: text/html\n\n"; print <<"END"; @@ -46,24 +56,24 @@ print <<"END";
- END -print `$leftinc`; -print <<"END"; +&print_html($left); + +print <<"END"; |
+END
+&print_html($title);
-
-
+print <<"END";
$heading- END print `$updatecmd`; @@ -73,7 +83,7 @@ my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { print "
\n\n"; } +&print_html($bottom); + print <<"END"; |
@@ -129,4 +169,10 @@ sub HTML_encode ($){
$encoded =~ s/</g;
$encoded =~ s/>/>/g;
return $encoded;
+}
+
+# Print a file without escaping HTML: -
+sub print_html ($) {
+ my ($filename) = @_;
+ print `cat $filename 2>&1`;
}