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.12 by tdb, Wed Jun 13 17:36:35 2001 UTC vs.
Revision 1.16 by tdb, Mon Jun 18 15:19:37 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  
39 < my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
40 < my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
39 > my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl";
40 > my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
41   my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist";
42   my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
36 my($leftinc) = "/home/sites/www.i-scream.org.uk/web/left.inc";
43  
44 + my ($left) = "../left.inc" ;
45 + my ($title) = "../title.inc";
46 + my ($bottom) = "../bottom.inc";
47 +
48   print "Content-type: text/html\n\n";
49  
50   print <<"END";
# Line 46 | Line 56 | print <<"END";
56   <title>The i-scream Project Commit Log</title>
57   </head>
58  
59 < <body bgcolor="#ffffff" link="#ffffff" alink="#ffffff" vlink="#ffffff" text="#000066">
59 > <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
60  
61   <table border="0" cellpadding="2" cellspacing="2">
62   <tr>
63    <td valign="top">
54
64   END
56 print `$leftinc`;
57 print <<"END";
65  
66 + &print_html($left);
67 +
68 + print <<"END";
69    </td>
70    <td valign="top">
71 + END
72  
73 + &print_html($title);
74  
75 < <a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
64 <
75 > print <<"END";
76   <h2>$heading</h2>
66
77   END
78  
79   print `$updatecmd`;
# Line 73 | Line 83 | my(@modules) = split (/\s+/, $modulelist);
83   foreach my $module (@modules) {
84  
85      print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
86 <    print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\">$module module</a></b></font>\n</td></tr>\n\n";
86 >    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";
87      print "<tr><td bgcolor=\"white\">\n";
88  
89      my(@lines) = `$logcmd $module 2>&1`;
# Line 83 | Line 93 | foreach my $module (@modules) {
93      else {
94          foreach my $line (@lines) {
95  
96 <            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
97 <                print "\n<font color=\"blue\"><b>";
96 >            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
97 >                print "\n<font color=\"blue\">\n<b>";
98                  print HTML_encode($1);
99 <                print "</b><i>";
100 <                print HTML_encode("by $2");
101 <                print "</i></font>\n"
99 >                print "</b>\n<i>";
100 >                print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
101 >                print HTML_encode("$2");
102 >                print "</a></i>\n</font>\n"
103              }
104 +            elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
105 +                #chop $line;
106 +                my ($file, $rest, $ext) = ($1, $2, $3);
107 +                print "<code>";
108 +                print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
109 +                print HTML_encode($file);
110 +                print "</a> ";
111 +                if($rest =~ /\((\S).(\S+)\)/) {
112 +                    my $newrev = "$1.$2";
113 +                    my $oldminver = $2-1;
114 +                    my $oldrev = "$1.$oldminver";
115 +                    if(!($1==1 && $2==1)) {
116 +                        my $diff = ".diff?r1=$oldrev&r2=$newrev";
117 +                        print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
118 +                        print HTML_encode($rest);
119 +                        print "</a>";
120 +                    }
121 +                    else {
122 +                        print HTML_encode($rest);
123 +                    }
124 +                }
125 +                else {
126 +                    print HTML_encode($rest);
127 +                }
128 +                print HTML_encode($ext);
129 +                print "</code><br>\n"
130 +            }
131              else {
132                  chop $line;
133                  print "<code>";
# Line 103 | Line 141 | foreach my $module (@modules) {
141      print "</table><p>\n\n";
142   }
143  
144 + &print_html($bottom);
145 +
146   print <<"END";
147  
148    </td>
# Line 129 | Line 169 | sub HTML_encode ($){
169      $encoded =~ s/</&lt;/g;
170      $encoded =~ s/>/&gt;/g;
171      return $encoded;
172 + }
173 +
174 + # Print a file without escaping HTML: -
175 + sub print_html ($) {
176 +    my ($filename) = @_;
177 +    print `cat $filename 2>&1`;
178   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines