X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=d3ca45366881446ae76c37990f9d6dc30e4ae8e6;hb=7013ca7da90ba12257bce742782153edc4b07f52;hp=43a98c90ec2a4fcb23ce34c0aa8e9213e6805397;hpb=b5ee7d5a2ebd1e9b009a35694935c82cce9303e0;p=www.i-scream.org.git diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi index 43a98c9..d3ca453 100755 --- a/cgi-bin/cvslog.cgi +++ b/cgi-bin/cvslog.cgi @@ -24,59 +24,96 @@ else { $heading = "Today's i-scream CVS commits"; } -print "Content-type: text/html\n\n"; +my($cvsroot) = "/cvs/i-scream"; + +my($modulelist)=$query->param('module'); +$modulelist = `ls $cvsroot` unless defined $modulelist; -my($cvs) = "/usr/bin/cvs"; 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'\>$today'\" -g \"-d$cvsroot\" -g \"-Q\""; my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; -my($updatecmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs -d $cvsroot -Q update -d"; +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";
+
+
+ @@ -98,3 +135,9 @@ sub HTML_encode ($){ $encoded =~ s/>/>/g; return $encoded; } + +# Print a file without escaping HTML: - +sub print_html ($) { + my ($filename) = @_; + print `cat $filename 2>&1`; +}