X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=0f86725d0380cbdd2846b99b4aa928726758ef2f;hb=refs%2Ftags%2FPRE_WWW_REDESIGN;hp=2c5c8eeeebdfac56fd0b6b5c6fc4bdae97bff49d;hpb=30190b3b383313aca7b58c544f281c32e9741abb;p=www.i-scream.org.git

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index 2c5c8ee..0f86725 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -44,7 +44,7 @@ $modulelist = `ls $cvsroot` unless defined $modulelist;
 $modulelist =~ s/[\r\n]/ /gm;
 
 my($cvs2clpath) = "/usr/local/bin/cvs2cl";
-my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+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";
 
@@ -116,13 +116,13 @@ foreach my $module (@modules) {
                 print HTML_encode("$2");
                 print "</i>\n</font>\n"
             }
-            elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
-                my ($file, $rest, $ext) = ($1, $2, $3);
+            elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) {
+                my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4);
                 print "<code>";
                 print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
                 print HTML_encode($file);
                 print "</a> ";
-                if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
+                if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) {
                     my $start = $1;
                     my $end = $2;
                     my $other = $3;
@@ -145,17 +145,17 @@ foreach my $module (@modules) {
                         print HTML_encode("$other)");
                     }
                     else {
-                        print HTML_encode($rest);
+                        print HTML_encode($rev);
                     }
                 }
                 else {
-                    print HTML_encode($rest);
+                    print HTML_encode($rev);
                 }
                 print HTML_encode($ext);
                 print "</code><br>\n"
             }
             else {
-                chop $line;
+                chomp $line;
                 print "<code>";
                 print HTML_encode($line);
                 print "</code><br>\n"