--- web/cgi-bin/cvslog.cgi 2001/12/09 02:53:36 1.20 +++ web/cgi-bin/cvslog.cgi 2003/05/11 20:03:36 1.23.2.1 @@ -44,13 +44,14 @@ $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 -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 ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; +my ($left) = "../htdocs/left.inc" ; +my ($title) = "../htdocs/title.inc"; +my ($bottom) = "../htdocs/bottom.inc"; print "Content-type: text/html\n\n"; @@ -83,7 +84,7 @@ print <<"END";

$heading

END -print `$updatecmd`; +print `$updatecmd >/dev/null 2>&1`; my(@modules) = split (/\s+/, $modulelist); @@ -123,11 +124,11 @@ foreach my $module (@modules) { print ""; print HTML_encode($file); print " "; - if($rest =~ /\((\d+).(\d+)(.*)\)/) { + if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { my $newrev = "$1.$2"; my $oldminver = $2-1; my $oldrev = "$1.$oldminver"; - if(!($1==1 && $2==1)) { + if($2 != 1) { my $diff = ".diff?r1=$oldrev&r2=$newrev"; print "("; print HTML_encode("$1.$2");