--- web/cgi-bin/cvslog.cgi 2001/06/05 17:20:12 1.6 +++ web/cgi-bin/cvslog.cgi 2001/06/15 16:11:17 1.15 @@ -24,58 +24,96 @@ else { $heading = "Today's i-scream CVS commits"; } -print "Content-type: text/html\n\n"; +my($cvsroot) = "/cvs/i-scream"; -my($cvs) = "/usr/bin/cvs"; +my($modulelist)=$query->param('module'); +$modulelist = `ls $cvsroot` unless defined $modulelist; + 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($cvs2clargs) = "--stdout -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 ($left) = "../left.inc" ; +my ($title) = "../title.inc"; +my ($bottom) = "../bottom.inc"; + +print "Content-type: text/html\n\n"; + print <<"END"; - The i-scream Project Daily Commit Log + The i-scream Project Commit Log - + + + + + +
+END -

$heading

+&print_html($left); +print <<"END"; + 		END +&print_html($title); + +print <<"END"; +

$heading

+END + print `$updatecmd`; -my $modulelist = `ls $cvsroot`; my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { - print "

$module module

\n"; - print ""; - print "Browse i-scream "$module" cvs module\n"; - print "
\n";
+    print "\n\n";
+    print "\n\n";
+    print "\n";
 
-    print "
\n\n";
+    print "
\n$module module\n
\n";
 
     my(@lines) = `$logcmd $module 2>&1`;
     if(@lines == 0) {
-        print "There have been no commits in this module during this period.";
+        print "There have been no commits in this module during this period.\n";
     }
     else {
         foreach my $line (@lines) {
-            print HTML_encode($line);
+
+            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
+                print "\n";
+                print HTML_encode($1);
+                print "";
+                print HTML_encode("by $2");
+                print "\n"
+            }
+            else {
+                chop $line;
+                print "";
+                print HTML_encode($line);
+                print "
\n"
+            }
         }
     }
+    print "
\n\n";
 }
 
+&print_html($bottom);
+
 print <<"END";
+
+
+ @@ -96,4 +134,10 @@ sub HTML_encode ($){ $encoded =~ s//>/g; return $encoded; +} + +# Print a file without escaping HTML: - +sub print_html ($) { + my ($filename) = @_; + print `cat $filename 2>&1`; }