--- web/cgi-bin/cvslog.cgi 2003/05/11 20:03:36 1.23.2.1 +++ web/cgi-bin/cvslog.cgi 2004/03/24 21:08:09 1.32 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -use CGI; +use CGI qw/:standard/; $query=new CGI; my($period)=$query->param('period'); $period = "today" unless defined $period; @@ -14,17 +14,17 @@ if($period eq "days") { if ($days < 1) {$days = 1}; $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; + $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; + $date = `/bin/date +%Y/%m/%d` unless defined $date; $heading = "i-scream CVS$moduleext commits since $date"; $firstdate = ">$date"; } @@ -34,7 +34,7 @@ elsif($period eq "thisweek") { } else { # default to "today only" - $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`; + $firstdate = ">" . `/bin/date +%Y/%m/%d`; $heading = "Today's i-scream CVS$moduleext commits"; } @@ -43,45 +43,60 @@ my($cvsroot) = "/cvs/i-scream"; $modulelist = `ls $cvsroot` unless defined $modulelist; $modulelist =~ s/[\r\n]/ /gm; -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($cvs2clargs) = "--stdout --no-wrap -r -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($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 ($left) = "../htdocs/left.inc" ; -my ($title) = "../htdocs/title.inc"; -my ($bottom) = "../htdocs/bottom.inc"; +my ($incdir) = "../nwww"; -print "Content-type: text/html\n\n"; +# Include files +my ($doctype) = "$incdir/doctype.inc"; +my ($style) = "$incdir/style.inc"; +my ($header) = "$incdir/header.inc"; +my ($footer) = "$incdir/footer.inc"; +my ($menu) = "$incdir/menu.inc" ; -print <<"END"; - +# Section markers +my ($secwho) = 1; +my ($secfiles) = 2; +my ($seclog) = 3; - +# This should be application/xhtml+xml +print "Content-type: text/html\n\n"; - - The i-scream Project Commit Log - +&print_html($doctype); - +print <<"END"; - - - - - -
+ + + i-scream CVS Commit Logs + END -&print_html($left); +&print_html($style); print <<"END"; - + + + +
+
END -&print_html($title); +&print_html($header); print <<"END"; -

$heading

+ +
+

+ i-scream CVS Commit Logs +

+

+ $heading +

+
END print `$updatecmd >/dev/null 2>&1`; @@ -89,107 +104,214 @@ print `$updatecmd >/dev/null 2>&1`; my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { + my($firstentry) = 1; + my($sec) = 0; + print <<"END"; +
+

+ $module module +

+END - print "\n\n"; - print "\n\n"; - print "\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.\n"; + print <<"END"; +

+ There have been no commits in this module during this period. +

+END } else { + my(@log) = (); foreach my $line (@lines) { - if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { - print "\n\n"; - print HTML_encode($1); - print "\n"; - print " commited by "; - print HTML_encode("$2"); - print "\n\n" + if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)(\s+<([^\s]+)>)?$/) { + my($datetime) = escapeHTML($1); + my($committer) = escapeHTML($2); + my($email) = $4; + + if($sec != $secwho) { + if($sec == $seclog) { + @log = &trim_array(@log); + foreach my $logline (@log) { + $logline =~ s/^\t//; + print escapeHTML("$logline\n"); + } + @log = (); + print <<"END"; + + +END + } + if($firstentry) { + $firstentry = 0; + print <<"END"; +
+END + } + else { + print <<"END"; +
+END + } + $sec = $secwho; + } + + print <<"END"; +

+ + $datetime + + committed by +END + if(defined $email) { + print <<"END"; + $committer +END + } + else { + print <<"END"; + $committer +END + } + print <<"END"; +

+END } - elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) { - print "\n\n"; - print HTML_encode($1); - print "\n"; - print " commited by "; - print HTML_encode("$2"); - print "\n\n" - } - elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { - #chop $line; - my ($file, $rest, $ext) = ($1, $2, $3); - print ""; - print ""; - print HTML_encode($file); - print " "; - if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { - my $newrev = "$1.$2"; - my $oldminver = $2-1; - my $oldrev = "$1.$oldminver"; - if($2 != 1) { - my $diff = ".diff?r1=$oldrev&r2=$newrev"; - print "("; - print HTML_encode("$1.$2"); - print ""; - print HTML_encode("$3)"); + elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) { + my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4); + $ext = escapeHTML($ext); + if($sec != $secfiles) { + $sec = $secfiles; + print <<"END"; +

+END + } + $file = escapeHTML($file); + print <<"END"; + $file +END + if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) { + my $start = $1; + my $end = $2; + my $other = $3; + my $newrev = "$start.$end"; + my $oldrev; + if($end != 1) { + my $oldminver = $end-1; + $oldrev = "$start.$oldminver"; } + elsif($start =~ /^((\d+\.)+)(\d+)$/) { + $oldrev = $1; + # take trailing . off old revision + chop $oldrev; + } + if(defined $oldrev) { + my $diff = ".diff?r1=$oldrev&r2=$newrev"; + my $startend = escapeHTML("$start.$end"); + $other = escapeHTML($other); + chomp $other; + print <<"END"; + ($startend$other)$ext +END + } else { - print HTML_encode($rest); + $rev = escapeHTML($rev); + print <<"END"; + $rev$ext +END } } else { - print HTML_encode($rest); + $rev = escapeHTML($rev); + print <<"END"; + $rev$ext +END } - print HTML_encode($ext); - print "
\n" + if($ext !~ /:$/) { + print <<"END"; +
+END + } } else { - chop $line; - print ""; - print HTML_encode($line); - print "
\n" + next if $sec == $secwho; # not done secfiles yet + if($sec != $seclog) { + $sec = $seclog; + print <<"END"; +

+ 
+END
+                }
+                chomp $line;
+                push(@log, $line);
             }
         }
+        if($sec == $seclog) {
+            @log = &trim_array(@log);
+            foreach my $logline (@log) {
+                $logline =~ s/^\t//;
+                print escapeHTML("$logline\n");
+            }
+            @log = ();
+            print <<"END";
+
+
+END + } } - print "

\n\n"; + print <<"END"; +

+END } -&print_html($bottom); +print <<"END"; +
+
+END +&print_html($footer); + print <<"END"; -
+ +END - +&print_html($menu); +print <<"END"; + + + END exit 0; -#------------------------------------------------------ -# sub HTML_encode -# -# escape HTML characters that may cause problems when -# shown either in the or within text fields. -#------------------------------------------------------ -sub HTML_encode ($){ - my ($encoded) = @_; - $encoded =~ s/&/&/g; - $encoded =~ s/"/"/g; - $encoded =~ s//>/g; - return $encoded; +# Print the contents of a file containing html +sub print_html { + my ($filename) = @_; + open(FILE, $filename); + while() { + print; + } + close FILE; } -# Print a file without escaping HTML: - -sub print_html ($) { - my ($filename) = @_; - print `cat $filename 2>&1`; +# Trim an array (remove beginning and end emptry entries) +sub trim_array { + my (@array) = @_; + for(my $i = 0; $i < scalar @array; $i++) { + if($array[$i] ne "") { + splice @array, 0, $i; + last; + } + } + for(my $i = scalar @array - 1; $i >= 0; $i--) { + if($array[$i] ne "") { + splice @array, $i+1; + last; + } + } + return @array; }