X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=ac30166221e26b2ae2c013352091006bab67a6c9;hb=7b4bd61dc61ca4fe23bd2ca766526a869a36202b;hp=1e165941f72438c2256caa467fe0c5cb930f8dbf;hpb=b1187e39d07b29bb57d567a4e600b65bc2a380ef;p=www.i-scream.org.git

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index 1e16594..ac30166 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -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";
 <h2>$heading</h2>
 END
 
-print `$updatecmd`;
+print `$updatecmd >/dev/null 2>&1`;
 
 my(@modules) = split (/\s+/, $modulelist);
 
@@ -123,11 +124,11 @@ foreach my $module (@modules) {
                 print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
                 print HTML_encode($file);
                 print "</a> ";
-                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 "(<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
                         print HTML_encode("$1.$2");