--- web/cgi-bin/cvslog.cgi 2003/05/12 07:49:58 1.23.2.4 +++ web/cgi-bin/cvslog.cgi 2003/05/12 13:25:32 1.24 @@ -43,14 +43,15 @@ my($cvsroot) = "/cvs/i-scream"; $modulelist = `ls $cvsroot` unless defined $modulelist; $modulelist =~ s/[\r\n]/ /gm; -my($cvs2clpath) = "/usr/local/bin/cvs2cl"; +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/iscream/bin/fullcvsupdate.sh $modulelist"; -my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs"; +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) = "../htdocs/left.inc" ; -my ($title) = "../htdocs/title.inc"; -my ($bottom) = "../htdocs/bottom.inc"; +my ($left) = "../left.inc" ; +my ($title) = "../title.inc"; +my ($bottom) = "../bottom.inc"; print "Content-type: text/html\n\n"; @@ -90,7 +91,7 @@ my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { print "\n\n"; - print "\n\n"; + print "\n\n"; print "
\n$module module\n
\n$module module\n
\n"; my(@lines) = `$logcmd $module 2>&1`; @@ -117,32 +118,22 @@ foreach my $module (@modules) { print "\n\n" } elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { + #chop $line; my ($file, $rest, $ext) = ($1, $2, $3); print ""; - print ""; + print ""; print HTML_encode($file); print " "; if($rest =~ /\((\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 $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("$start.$end"); + print "("; + print HTML_encode("$1.$2"); print ""; - print HTML_encode("$other)"); + print HTML_encode("$3)"); } else { print HTML_encode($rest);