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.10 by tdb, Wed Jun 13 15:53:51 2001 UTC vs.
Revision 1.17 by tdb, Sun Oct 21 17:38:55 2001 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 >    $firstdate = ">" . `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
18   }
19 + elsif($period eq "date") {
20 +    my($date)=$query->param('date');
21 +    $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date;
22 +    $heading = "i-scream CVS$moduleext commits on $date";
23 +    $firstdate = "$date 00:00<$date 23:59"
24 + }
25   elsif($period eq "thisweek") {
26 <   $firstdate = "last Sunday";
27 <   $heading = "i-scream CVS commits this week";
26 >    $firstdate = ">last Sunday";
27 >    $heading = "i-scream CVS$moduleext commits this week";
28   }
29   else {
30 <   # default to "today only"
31 <   $firstdate = `/bin/date \"+%Y/%m/%d\"`;
32 <   $heading = "Today's i-scream CVS commits";
30 >    # default to "today only"
31 >    $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`;
32 >    $heading = "Today's i-scream CVS$moduleext commits";
33   }
34  
35   my($cvsroot) = "/cvs/i-scream";
36  
29 – my($modulelist)=$query->param('module');
37   $modulelist = `ls $cvsroot` unless defined $modulelist;
38 + $modulelist =~ s/[\r\n]/ /gm;
39  
40 < my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
41 < my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
40 > my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl";
41 > my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
42   my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist";
43   my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
44  
45 + my ($left) = "../left.inc" ;
46 + my ($title) = "../title.inc";
47 + my ($bottom) = "../bottom.inc";
48 +
49   print "Content-type: text/html\n\n";
50  
51   print <<"END";
# Line 45 | Line 57 | print <<"END";
57   <title>The i-scream Project Commit Log</title>
58   </head>
59  
60 < <body bgcolor="#ffffff" link="#ffffff" alink="#ffffff" vlink="#ffffff" text="#000066">
60 > <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
61  
62 < <a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
62 > <table border="0" cellpadding="2" cellspacing="2">
63 > <tr>
64 >  <td valign="top">
65 > END
66  
67 < <h2>$heading</h2>
67 > &print_html($left);
68  
69 + print <<"END";
70 +  </td>
71 +  <td valign="top">
72   END
73  
74 + &print_html($title);
75 +
76 + print <<"END";
77 + <h2>$heading</h2>
78 + END
79 +
80   print `$updatecmd`;
81  
82   my(@modules) = split (/\s+/, $modulelist);
83  
84   foreach my $module (@modules) {
85  
86 <    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">";
87 <    print "<tr><td><font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">$module module</a></b></font></td></tr>";
86 >    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
87 >    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";
88      print "<tr><td bgcolor=\"white\">\n";
89  
90      my(@lines) = `$logcmd $module 2>&1`;
# Line 70 | Line 94 | foreach my $module (@modules) {
94      else {
95          foreach my $line (@lines) {
96  
97 <            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
98 <                print "<font color=\"blue\"><b>";
97 >            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
98 >                print "\n<font color=\"blue\">\n<b>";
99                  print HTML_encode($1);
100 <                print "</b><i>";
101 <                print HTML_encode("by $2");
102 <                print "</i></font>"
100 >                print "</b>\n<i>";
101 >                print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
102 >                print HTML_encode("$2");
103 >                print "</a></i>\n</font>\n"
104              }
105 +            elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
106 +                #chop $line;
107 +                my ($file, $rest, $ext) = ($1, $2, $3);
108 +                print "<code>";
109 +                print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
110 +                print HTML_encode($file);
111 +                print "</a> ";
112 +                if($rest =~ /\((\S).(\S+)\)/) {
113 +                    my $newrev = "$1.$2";
114 +                    my $oldminver = $2-1;
115 +                    my $oldrev = "$1.$oldminver";
116 +                    if(!($1==1 && $2==1)) {
117 +                        my $diff = ".diff?r1=$oldrev&r2=$newrev";
118 +                        print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
119 +                        print HTML_encode($rest);
120 +                        print "</a>";
121 +                    }
122 +                    else {
123 +                        print HTML_encode($rest);
124 +                    }
125 +                }
126 +                else {
127 +                    print HTML_encode($rest);
128 +                }
129 +                print HTML_encode($ext);
130 +                print "</code><br>\n"
131 +            }
132              else {
133                  chop $line;
134                  print "<code>";
135                  print HTML_encode($line);
136 <                print "</code><br>"
136 >                print "</code><br>\n"
137              }
138          }
139      }
# Line 90 | Line 142 | foreach my $module (@modules) {
142      print "</table><p>\n\n";
143   }
144  
145 + &print_html($bottom);
146 +
147   print <<"END";
148  
149 +  </td>
150 + </tr>
151 + </table>
152 +
153   </body>
154  
155   </html>
# Line 112 | Line 170 | sub HTML_encode ($){
170      $encoded =~ s/</&lt;/g;
171      $encoded =~ s/>/&gt;/g;
172      return $encoded;
173 + }
174 +
175 + # Print a file without escaping HTML: -
176 + sub print_html ($) {
177 +    my ($filename) = @_;
178 +    print `cat $filename 2>&1`;
179   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines