]> i-scream Git - www.i-scream.org.git/blobdiff - cgi-bin/cvslog.cgi
i-scream / www.i-scream.org.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Another biggish commit.
[www.i-scream.org.git] / cgi-bin / cvslog.cgi
diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index 5d542c7529a36d67b1ac67b36e9c48c7cf81fac0..337bc05e6fb56e4e0954f1da6f862b65e35b2018 100755 (executable)
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -w
 
+# TODO: remove tables, and use CSS instead
+
 use CGI;
 $query=new CGI;
 my($period)=$query->param('period');
@@ -14,8 +16,7 @@ if($period eq "days") {
     if ($days < 1) {$days = 1};
     $heading = "i-scream CVS$moduleext commits in the past $days day(s)";
     $days--;
-    $days .= "d"; # because we can't write "$daysd" below :-)
-    $firstdate = ">" . `/bin/date -v-$days +%Y/%m/%d`;
+    $firstdate = ">" . `/bin/date -v-${days}d +%Y/%m/%d`;
 }
 elsif($period eq "date") {
     my($date)=$query->param('date');
@@ -45,42 +46,45 @@ $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";
 
-my ($left) = "../htdocs/left.inc" ;
-my ($title) = "../htdocs/title.inc";
-my ($bottom) = "../htdocs/bottom.inc";
+my ($menu) = "../nwww/menu.inc" ;
+my ($header) = "../nwww/header.inc";
+my ($footer) = "../nwww/footer.inc";
+my ($style) = "../nwww/style.inc";
 
 print "Content-type: text/html\n\n";
 
 print <<"END";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html>
 
 <head>
- <title>The i-scream Project Commit Log</title>
-</head>
-
-<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
-
-<table border="0" cellpadding="2" cellspacing="2">
- <tr>
-  <td valign="top">
+ <title>i-scream CVS Commit Logs</title>
 END
 
-&print_html($left);
+&print_html($style);
 
 print <<"END";
-  </td>
-  <td valign="top">
+</head>
+
+<body>
+
+<div id="container">
+
+<div id="main">
 END
 
-&print_html($title);
+&print_html($header);
 
 print <<"END";
+<div id="contents">
+<h1 class="top">i-scream CVS Commit Logs</h1>
+
 <h2>$heading</h2>
 END
 
@@ -91,7 +95,7 @@ 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=\"http://cvs.i-scream.org/$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`;
@@ -105,7 +109,7 @@ foreach my $module (@modules) {
                 print "\n<font color=\"blue\">\n<b>";
                 print HTML_encode($1);
                 print "</b>\n<i>";
-                print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
+                print " committed by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
                 print HTML_encode("$2");
                 print "</a></i>\n</font>\n"
             }
@@ -113,17 +117,17 @@ foreach my $module (@modules) {
                 print "\n<font color=\"blue\">\n<b>";
                 print HTML_encode($1);
                 print "</b>\n<i>";
-                print " commited by ";
+                print " committed by ";
                 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;
@@ -146,20 +150,20 @@ 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"
+                print "</code><br/>\n"
             }
             else {
-                chop $line;
+                chomp $line;
                 print "<code>";
                 print HTML_encode($line);
-                print "</code><br>\n"
+                print "</code><br/>\n"
             }
         }
     }
@@ -168,16 +172,18 @@ foreach my $module (@modules) {
     print "</table><p>\n\n";
 }
 
-&print_html($bottom);
+print "</div>";
 
-print <<"END";
+&print_html($footer);
 
-  </td>
- </tr>
-</table>
+print "</div>";
 
-</body>
+&print_html($menu);
 
+print <<"END";
+</div>
+
+</body>
 </html>
 END
 
www.i-scream.org