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

Comparing web/cgi-bin/cvswww-extract.cgi (file contents):
Revision 1.1 by tdb, Thu Oct 26 00:16:37 2000 UTC vs.
Revision 1.4 by tdb, Sun May 6 19:16:40 2001 UTC

# Line 16 | Line 16 | $query=new CGI;
16   $site=$query->param('site');
17  
18   # Settings
19 < if(-e "/usr/local/proj/co600_10" && -d "/usr/local/proj/co600_10"){
20 <    # Assuming on Raptor
21 <    my ($left) = "../webpages/left.inc";
22 <    my ($title) = "../webpages/title.inc";
23 <    my ($bottom) = "../webpages/bottom.inc";
24 < }
25 < elsif (-e "/home/sites/www.i-scream.org.uk" && -d "/home/sites/www.i-scream.org.uk"){
26 <    # Assuming on Main Site
27 <    my ($left) = "../left.inc";
28 <    my ($title) = "../title.inc";
29 <    my ($bottom) = "../bottom.inc";
30 < }
19 > my ($left) = "http://www.i-scream.org.uk/left.inc";
20 > my ($title) = "http://www.i-scream.org.uk/title.inc";
21 > my ($bottom) = "http://www.i-scream.org.uk/bottom.inc";
22  
23   print "Content-type: text/html\n\n";
24  
# Line 38 | Line 29 | print << "EOF";
29      cvswww-extract.cgi
30      Script to extract webpages onto webserver
31      Created by tdb1 20/10/2000
32 <    Last modified 20/10/2000
32 >    Last modified 06/05/2001
33   -->
34  
35   <html>
36  
37   <head>
38 <  <title>The i-Scream Project CVS Website Extracter!</title>
38 >  <title>The i-Scream Project CVS Website Extracter</title>
39   </head>
40  
41   <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
# Line 54 | Line 45 | print << "EOF";
45      <td valign="top">
46   EOF
47  
48 < &print_file($left);
48 > print `/usr/local/bin/wget -O - -q $left 2>&1`;
49  
50   print << "EOF";
51  
# Line 62 | Line 53 | print << "EOF";
53      <td valign="top">
54   EOF
55  
56 < &print_file($title);
56 > print `/usr/local/bin/wget -O - -q $title 2>&1`;
57  
58   print "<pre>\n";
59  
# Line 70 | Line 61 | print "<pre>\n";
61   if($site eq "raptor" && -e "/usr/local/proj/co600_10" && -d "/usr/local/proj/co600_10"){
62  
63   print "<b>Debugging output from run on Raptor:</b>\n";
64 < print `/usr/local/proj/co600_10/scripts/cvswww-extract-cmd`;
64 > print `/usr/local/proj/co600_10/scripts/cvswww-extract-cmd 2>&1`;
65  
66   print "\n<b>Debugging output from cleanup:</b>\n";
67 < print `/usr/local/proj/co600_10/scripts/cvswww-clean`;
67 > print `/usr/local/proj/co600_10/scripts/cvswww-clean 2>&1`;
68  
69   }
70   elsif($site eq "main" && -e "/home/sites/www.i-scream.org.uk" && -d "/home/sites/www.i-scream.org.uk"){
71  
72   print "<b>Debugging output from extract:</b>\n";
73 < print `cd /home/sites/www.i-scream.org.uk/web && gunzip cvswww-extract.tar.gz && tar -xvf cvswww-extract.tar && rm -f cvswww-extract.tar`;
73 > print `cd /home/sites/www.i-scream.org.uk/web && gunzip cvswww-extract.tar.gz && tar -xvf cvswww-extract.tar && rm -f cvswww-extract.tar 2>&1`;
74  
75   }
76   else{
# Line 88 | Line 79 | else{
79  
80   print "</pre>\n";
81  
82 < &print_file($bottom);
82 > print `/usr/local/bin/wget -O - -q $bottom 2>&1`;
83  
84   print << "EOF";
85  
# Line 102 | Line 93 | print << "EOF";
93   EOF
94  
95   exit 0;
105
106 sub print_file ($) {
107    my ($filename) = @_;
108    print `cat $filename`;
109 }
110
111 sub print_file_old ($) {
112    my ($filename) = @_;
113    open(FILE, $filename) or die "Cannot open $filename: $!\n";
114    while (my ($line) = <FILE>) {
115        print $line;
116    }
117 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines