X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvswww-extract.cgi;h=099d8484687f103023d784fe04b82023d79c5ca8;hb=60c652cdf099df77e5151af5120bc709414d8b03;hp=6383c0668663444897b088fb436343416abfed7e;hpb=8937c829bc3f6c4f2546621a3a209aae90333647;p=www.i-scream.org.git
diff --git a/cgi-bin/cvswww-extract.cgi b/cgi-bin/cvswww-extract.cgi
index 6383c06..099d848 100755
--- a/cgi-bin/cvswww-extract.cgi
+++ b/cgi-bin/cvswww-extract.cgi
@@ -16,18 +16,9 @@ $query=new CGI;
$site=$query->param('site');
# Settings
-if(-e "/usr/local/proj/co600_10" && -d "/usr/local/proj/co600_10"){
- # Assuming on Raptor
- my ($left) = "../webpages/left.inc";
- my ($title) = "../webpages/title.inc";
- my ($bottom) = "../webpages/bottom.inc";
-}
-elsif (-e "/home/sites/www.i-scream.org.uk" && -d "/home/sites/www.i-scream.org.uk"){
- # Assuming on Main Site
- my ($left) = "../left.inc";
- my ($title) = "../title.inc";
- my ($bottom) = "../bottom.inc";
-}
+my ($left) = "http://www.i-scream.org.uk/left.inc";
+my ($title) = "http://www.i-scream.org.uk/title.inc";
+my ($bottom) = "http://www.i-scream.org.uk/bottom.inc";
print "Content-type: text/html\n\n";
@@ -38,13 +29,13 @@ print << "EOF";
cvswww-extract.cgi
Script to extract webpages onto webserver
Created by tdb1 20/10/2000
- Last modified 20/10/2000
+ Last modified 06/05/2001
-->
- The i-Scream Project CVS Website Extracter!
+ The i-Scream Project CVS Website Extracter
@@ -54,7 +45,7 @@ print << "EOF";
|
EOF
-&print_file($left);
+print `/usr/local/bin/wget -O - -q $left 2>&1`;
print << "EOF";
@@ -62,7 +53,7 @@ print << "EOF";
|
EOF
-&print_file($title);
+print `/usr/local/bin/wget -O - -q $title 2>&1`;
print "\n";
@@ -70,16 +61,16 @@ print "\n";
if($site eq "raptor" && -e "/usr/local/proj/co600_10" && -d "/usr/local/proj/co600_10"){
print "Debugging output from run on Raptor:\n";
-print `/usr/local/proj/co600_10/scripts/cvswww-extract-cmd`;
+print `/usr/local/proj/co600_10/scripts/cvswww-extract-cmd 2>&1`;
print "\nDebugging output from cleanup:\n";
-print `/usr/local/proj/co600_10/scripts/cvswww-clean`;
+print `/usr/local/proj/co600_10/scripts/cvswww-clean 2>&1`;
}
elsif($site eq "main" && -e "/home/sites/www.i-scream.org.uk" && -d "/home/sites/www.i-scream.org.uk"){
print "Debugging output from extract:\n";
-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`;
+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`;
}
else{
@@ -88,7 +79,7 @@ else{
print "\n";
-&print_file($bottom);
+print `/usr/local/bin/wget -O - -q $bottom 2>&1`;
print << "EOF";
@@ -102,16 +93,3 @@ print << "EOF";
EOF
exit 0;
-
-sub print_file ($) {
- my ($filename) = @_;
- print `cat $filename`;
-}
-
-sub print_file_old ($) {
- my ($filename) = @_;
- open(FILE, $filename) or die "Cannot open $filename: $!\n";
- while (my ($line) = ) {
- print $line;
- }
-}
|