X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=cb1671dbad1573c9526c0e6b9600387a5434d071;hb=37283aa2a8e2b416d6e06e2e3681d8ce467d945c;hp=da87f362ee5521a9e1f61cbdafc84b21a225950b;hpb=3f530c717b353dd37416c5cf8d6dd19ffaf34478;p=www.i-scream.org.git

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index da87f36..cb1671d 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -43,14 +43,15 @@ 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($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 -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 ($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,14 +84,14 @@ print <<"END";
 <h2>$heading</h2>
 END
 
-print `$updatecmd`;
+print `$updatecmd >/dev/null 2>&1`;
 
 my(@modules) = split (/\s+/, $modulelist);
 
 foreach my $module (@modules) {
 
     print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
-    print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n";
+    print "<tr><td>\n<font size=\"4\"><b><a href=\"http://cvs.i-scream.org/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n";
     print "<tr><td bgcolor=\"white\">\n";
 
     my(@lines) = `$logcmd $module 2>&1`;
@@ -108,20 +109,28 @@ foreach my $module (@modules) {
                 print HTML_encode("$2");
                 print "</a></i>\n</font>\n"
             }
+            elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) {
+                print "\n<font color=\"blue\">\n<b>";
+                print HTML_encode($1);
+                print "</b>\n<i>";
+                print " commited by ";
+                print HTML_encode("$2");
+                print "</i>\n</font>\n"
+            }
             elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
                 #chop $line;
                 my ($file, $rest, $ext) = ($1, $2, $3);
                 print "<code>";
-                print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
+                print "<a href=\"http://cvs.i-scream.org/$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 "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
                         print HTML_encode("$1.$2");
                         print "</a>";
                         print HTML_encode("$3)");