ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/web/cgi-bin/cvslog.cgi
(Generate patch)

Comparing web/cgi-bin/cvslog.cgi (file contents):
Revision 1.8 by tdb, Wed Jun 13 15:24:40 2001 UTC vs.
Revision 1.23.2.5 by tdb, Tue May 13 15:18:13 2003 UTC

# Line 4 | Line 4 | use CGI;
4   $query=new CGI;
5   my($period)=$query->param('period');
6   $period = "today" unless defined $period;
7 + my($modulelist)=$query->param('module');
8 + my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist;
9  
10   my($firstdate);
11   if($period eq "days") {
12      my($days)=$query->param('days');
13      $days = 1 unless defined $days;
14      if ($days < 1) {$days = 1};
15 <    $heading = "i-scream CVS commits in the past $days day(s)";
15 >    $heading = "i-scream CVS$moduleext commits in the past $days day(s)";
16      $days--;
17 <    $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
17 >    $days .= "d"; # because we can't write "$daysd" below :-)
18 >    $firstdate = ">" . `/bin/date -v-$days +%Y/%m/%d`;
19   }
20 + elsif($period eq "date") {
21 +    my($date)=$query->param('date');
22 +    $date = `/bin/date +%Y/%m/%d` unless defined $date;
23 +    $heading = "i-scream CVS$moduleext commits on $date";
24 +    $firstdate = "$date 00:00<$date 23:59"
25 + }
26 + elsif($period eq "since") {
27 +    my($date)=$query->param('date');
28 +    $date = `/bin/date +%Y/%m/%d` unless defined $date;
29 +    $heading = "i-scream CVS$moduleext commits since $date";
30 +    $firstdate = ">$date";
31 + }
32   elsif($period eq "thisweek") {
33 <   $firstdate = "last Sunday";
34 <   $heading = "i-scream CVS commits this week";
33 >    $firstdate = ">last Sunday";
34 >    $heading = "i-scream CVS$moduleext commits this week";
35   }
36   else {
37 <   # default to "today only"
38 <   $firstdate = `/bin/date \"+%Y/%m/%d\"`;
39 <   $heading = "Today's i-scream CVS commits";
37 >    # default to "today only"
38 >    $firstdate = ">" . `/bin/date +%Y/%m/%d`;
39 >    $heading = "Today's i-scream CVS$moduleext commits";
40   }
41  
27 print "Content-type: text/html\n\n";
28
29 my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
42   my($cvsroot) = "/cvs/i-scream";
31 my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
32 my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh";
33 my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
43  
44 + $modulelist = `ls $cvsroot` unless defined $modulelist;
45 + $modulelist =~ s/[\r\n]/ /gm;
46 +
47 + my($cvs2clpath) = "/usr/local/bin/cvs2cl";
48 + my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
49 + my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
50 + my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
51 +
52 + my ($left) = "../htdocs/left.inc" ;
53 + my ($title) = "../htdocs/title.inc";
54 + my ($bottom) = "../htdocs/bottom.inc";
55 +
56 + print "Content-type: text/html\n\n";
57 +
58   print <<"END";
59   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
60  
# Line 41 | Line 64 | print <<"END";
64   <title>The i-scream Project Commit Log</title>
65   </head>
66  
67 < <body bgcolor="#ffffff" link="#ffffff" alink="#ffffff" vlink="#ffffff" text="#000066">
67 > <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
68  
69 < <a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
69 > <table border="0" cellpadding="2" cellspacing="2">
70 > <tr>
71 >  <td valign="top">
72 > END
73  
74 < <h2>$heading</h2>
49 < <p>&nbsp;</p>
74 > &print_html($left);
75  
76 + print <<"END";
77 +  </td>
78 +  <td valign="top">
79   END
80  
81 < print `$updatecmd`;
81 > &print_html($title);
82  
83 < my $modulelist = `ls $cvsroot`;
83 > print <<"END";
84 > <h2>$heading</h2>
85 > END
86 >
87 > print `$updatecmd >/dev/null 2>&1`;
88 >
89   my(@modules) = split (/\s+/, $modulelist);
90  
91   foreach my $module (@modules) {
92  
93 <    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">";
94 <    print "<tr><td><font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">$module module</a></b></font></td></tr>";
93 >    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
94 >    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";
95      print "<tr><td bgcolor=\"white\">\n";
96  
97      my(@lines) = `$logcmd $module 2>&1`;
# Line 68 | Line 101 | foreach my $module (@modules) {
101      else {
102          foreach my $line (@lines) {
103  
104 <            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
105 <                print "<font color=\"blue\"><b>";
104 >            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
105 >                print "\n<font color=\"blue\">\n<b>";
106                  print HTML_encode($1);
107 <                print "</b><i>";
108 <                print HTML_encode("by $2");
109 <                print "</i></font>"
107 >                print "</b>\n<i>";
108 >                print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
109 >                print HTML_encode("$2");
110 >                print "</a></i>\n</font>\n"
111              }
112 +            elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) {
113 +                print "\n<font color=\"blue\">\n<b>";
114 +                print HTML_encode($1);
115 +                print "</b>\n<i>";
116 +                print " commited by ";
117 +                print HTML_encode("$2");
118 +                print "</i>\n</font>\n"
119 +            }
120 +            elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
121 +                my ($file, $rest, $ext) = ($1, $2, $3);
122 +                print "<code>";
123 +                print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
124 +                print HTML_encode($file);
125 +                print "</a> ";
126 +                if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
127 +                    my $start = $1;
128 +                    my $end = $2;
129 +                    my $other = $3;
130 +                    my $newrev = "$start.$end";
131 +                    my $oldrev;
132 +                    if($end != 1) {
133 +                        my $oldminver = $end-1;
134 +                        $oldrev = "$start.$oldminver";
135 +                    }
136 +                    elsif($start =~ /^((\d+\.)+)(\d+)$/) {
137 +                        $oldrev = $1;
138 +                        # take trailing . off old revision
139 +                        chop $oldrev;
140 +                    }
141 +                    if(defined $oldrev) {
142 +                        my $diff = ".diff?r1=$oldrev&r2=$newrev";
143 +                        print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
144 +                        print HTML_encode("$start.$end");
145 +                        print "</a>";
146 +                        print HTML_encode("$other)");
147 +                    }
148 +                    else {
149 +                        print HTML_encode($rest);
150 +                    }
151 +                }
152 +                else {
153 +                    print HTML_encode($rest);
154 +                }
155 +                print HTML_encode($ext);
156 +                print "</code><br>\n"
157 +            }
158              else {
159                  chop $line;
160                  print "<code>";
161                  print HTML_encode($line);
162 <                print "</code><br>"
162 >                print "</code><br>\n"
163              }
164          }
165      }
# Line 88 | Line 168 | foreach my $module (@modules) {
168      print "</table><p>\n\n";
169   }
170  
171 + &print_html($bottom);
172 +
173   print <<"END";
174  
175 +  </td>
176 + </tr>
177 + </table>
178 +
179   </body>
180  
181   </html>
# Line 110 | Line 196 | sub HTML_encode ($){
196      $encoded =~ s/</&lt;/g;
197      $encoded =~ s/>/&gt;/g;
198      return $encoded;
199 + }
200 +
201 + # Print a file without escaping HTML: -
202 + sub print_html ($) {
203 +    my ($filename) = @_;
204 +    print `cat $filename 2>&1`;
205   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines