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 "since") { |
26 |
+ |
my($date)=$query->param('date'); |
27 |
+ |
$date = `/bin/date \"+%Y/%m/%d\"` unless defined $date; |
28 |
+ |
$heading = "i-scream CVS$moduleext commits since $date"; |
29 |
+ |
$firstdate = ">$date"; |
30 |
+ |
} |
31 |
|
elsif($period eq "thisweek") { |
32 |
< |
$firstdate = "last Sunday"; |
33 |
< |
$heading = "i-scream CVS commits this week"; |
32 |
> |
$firstdate = ">last Sunday"; |
33 |
> |
$heading = "i-scream CVS$moduleext commits this week"; |
34 |
|
} |
35 |
|
else { |
36 |
< |
# default to "today only" |
37 |
< |
$firstdate = `/bin/date \"+%Y/%m/%d\"`; |
38 |
< |
$heading = "Today's i-scream CVS commits"; |
36 |
> |
# default to "today only" |
37 |
> |
$firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`; |
38 |
> |
$heading = "Today's i-scream CVS$moduleext commits"; |
39 |
|
} |
40 |
|
|
27 |
– |
print "Content-type: text/html\n\n"; |
28 |
– |
|
29 |
– |
my($cvs) = "/usr/bin/cvs"; |
30 |
– |
my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl"; |
41 |
|
my($cvsroot) = "/cvs/i-scream"; |
42 |
< |
#my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$today'\" -g \"-d$cvsroot\" -g \"-Q\""; |
43 |
< |
my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
44 |
< |
my($updatecmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs -d $cvsroot -Q update -d"; |
42 |
> |
|
43 |
> |
$modulelist = `ls $cvsroot` unless defined $modulelist; |
44 |
> |
$modulelist =~ s/[\r\n]/ /gm; |
45 |
> |
|
46 |
> |
my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl"; |
47 |
> |
my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
48 |
> |
my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; |
49 |
|
my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; |
50 |
|
|
51 |
+ |
my ($left) = "../left.inc" ; |
52 |
+ |
my ($title) = "../title.inc"; |
53 |
+ |
my ($bottom) = "../bottom.inc"; |
54 |
+ |
|
55 |
+ |
print "Content-type: text/html\n\n"; |
56 |
+ |
|
57 |
|
print <<"END"; |
58 |
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
59 |
|
|
60 |
|
<html> |
61 |
|
|
62 |
|
<head> |
63 |
< |
<title>The i-scream Project Daily Commit Log</title> |
63 |
> |
<title>The i-scream Project Commit Log</title> |
64 |
|
</head> |
65 |
|
|
66 |
|
<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066"> |
67 |
|
|
68 |
< |
<a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a> |
68 |
> |
<table border="0" cellpadding="2" cellspacing="2"> |
69 |
> |
<tr> |
70 |
> |
<td valign="top"> |
71 |
> |
END |
72 |
|
|
73 |
< |
<h2>$heading</h2> |
73 |
> |
&print_html($left); |
74 |
|
|
75 |
+ |
print <<"END"; |
76 |
+ |
</td> |
77 |
+ |
<td valign="top"> |
78 |
|
END |
79 |
|
|
80 |
+ |
&print_html($title); |
81 |
+ |
|
82 |
+ |
print <<"END"; |
83 |
+ |
<h2>$heading</h2> |
84 |
+ |
END |
85 |
+ |
|
86 |
|
print `$updatecmd`; |
87 |
|
|
56 |
– |
my $modulelist = `ls $cvsroot`; |
88 |
|
my(@modules) = split (/\s+/, $modulelist); |
89 |
|
|
90 |
|
foreach my $module (@modules) { |
91 |
|
|
92 |
< |
print "<p><h3>$module module</h3>\n"; |
93 |
< |
print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">"; |
94 |
< |
print "Browse i-scream "$module" cvs module</a>\n"; |
64 |
< |
print "<pre>\n"; |
92 |
> |
print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n"; |
93 |
> |
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"; |
94 |
> |
print "<tr><td bgcolor=\"white\">\n"; |
95 |
|
|
96 |
|
my(@lines) = `$logcmd $module 2>&1`; |
97 |
|
if(@lines == 0) { |
98 |
< |
print "There have been no commits in this module during this period."; |
98 |
> |
print "There have been no commits in this module during this period.\n"; |
99 |
|
} |
100 |
|
else { |
101 |
|
foreach my $line (@lines) { |
102 |
< |
print HTML_encode($line); |
102 |
> |
|
103 |
> |
if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { |
104 |
> |
print "\n<font color=\"blue\">\n<b>"; |
105 |
> |
print HTML_encode($1); |
106 |
> |
print "</b>\n<i>"; |
107 |
> |
print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">"; |
108 |
> |
print HTML_encode("$2"); |
109 |
> |
print "</a></i>\n</font>\n" |
110 |
> |
} |
111 |
> |
elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) { |
112 |
> |
print "\n<font color=\"blue\">\n<b>"; |
113 |
> |
print HTML_encode($1); |
114 |
> |
print "</b>\n<i>"; |
115 |
> |
print " commited by "; |
116 |
> |
print HTML_encode("$2"); |
117 |
> |
print "</i>\n</font>\n" |
118 |
> |
} |
119 |
> |
elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { |
120 |
> |
#chop $line; |
121 |
> |
my ($file, $rest, $ext) = ($1, $2, $3); |
122 |
> |
print "<code>"; |
123 |
> |
print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">"; |
124 |
> |
print HTML_encode($file); |
125 |
> |
print "</a> "; |
126 |
> |
if($rest =~ /\((\d+).(\d+)(.*)\)/) { |
127 |
> |
my $newrev = "$1.$2"; |
128 |
> |
my $oldminver = $2-1; |
129 |
> |
my $oldrev = "$1.$oldminver"; |
130 |
> |
if(!($1==1 && $2==1)) { |
131 |
> |
my $diff = ".diff?r1=$oldrev&r2=$newrev"; |
132 |
> |
print "(<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">"; |
133 |
> |
print HTML_encode("$1.$2"); |
134 |
> |
print "</a>"; |
135 |
> |
print HTML_encode("$3)"); |
136 |
> |
} |
137 |
> |
else { |
138 |
> |
print HTML_encode($rest); |
139 |
> |
} |
140 |
> |
} |
141 |
> |
else { |
142 |
> |
print HTML_encode($rest); |
143 |
> |
} |
144 |
> |
print HTML_encode($ext); |
145 |
> |
print "</code><br>\n" |
146 |
> |
} |
147 |
> |
else { |
148 |
> |
chop $line; |
149 |
> |
print "<code>"; |
150 |
> |
print HTML_encode($line); |
151 |
> |
print "</code><br>\n" |
152 |
> |
} |
153 |
|
} |
154 |
|
} |
155 |
+ |
print "</td></tr>\n"; |
156 |
|
|
157 |
< |
print "</pre></p>\n\n"; |
157 |
> |
print "</table><p>\n\n"; |
158 |
|
} |
159 |
|
|
160 |
+ |
&print_html($bottom); |
161 |
+ |
|
162 |
|
print <<"END"; |
163 |
+ |
|
164 |
+ |
</td> |
165 |
+ |
</tr> |
166 |
+ |
</table> |
167 |
+ |
|
168 |
|
</body> |
169 |
|
|
170 |
|
</html> |
185 |
|
$encoded =~ s/</</g; |
186 |
|
$encoded =~ s/>/>/g; |
187 |
|
return $encoded; |
188 |
+ |
} |
189 |
+ |
|
190 |
+ |
# Print a file without escaping HTML: - |
191 |
+ |
sub print_html ($) { |
192 |
+ |
my ($filename) = @_; |
193 |
+ |
print `cat $filename 2>&1`; |
194 |
|
} |