]> i-scream Git - www.i-scream.org.git/blobdiff - cgi-bin/cvswww-extract.cgi
i-scream / www.i-scream.org.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
An overview of the system with a feature list. Taken from the Server User Guide.
[www.i-scream.org.git] / cgi-bin / cvswww-extract.cgi
diff --git a/cgi-bin/cvswww-extract.cgi b/cgi-bin/cvswww-extract.cgi
index 6383c0668663444897b088fb436343416abfed7e..099d8484687f103023d784fe04b82023d79c5ca8 100755 (executable)
--- 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
 -->
 
 <html>
 
 <head>
-  <title>The i-Scream Project CVS Website Extracter!</title>
+  <title>The i-Scream Project CVS Website Extracter</title>
 </head>
 
 <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
@@ -54,7 +45,7 @@ print << "EOF";
     <td valign="top">
 EOF
 
-&print_file($left);
+print `/usr/local/bin/wget -O - -q $left 2>&1`;
 
 print << "EOF";
 
@@ -62,7 +53,7 @@ print << "EOF";
     <td valign="top">
 EOF
 
-&print_file($title);
+print `/usr/local/bin/wget -O - -q $title 2>&1`;
 
 print "<pre>\n";
 
@@ -70,16 +61,16 @@ print "<pre>\n";
 if($site eq "raptor" && -e "/usr/local/proj/co600_10" && -d "/usr/local/proj/co600_10"){
 
 print "<b>Debugging output from run on Raptor:</b>\n";
-print `/usr/local/proj/co600_10/scripts/cvswww-extract-cmd`;
+print `/usr/local/proj/co600_10/scripts/cvswww-extract-cmd 2>&1`;
 
 print "\n<b>Debugging output from cleanup:</b>\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 "<b>Debugging output from extract:</b>\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 "</pre>\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) = <FILE>) {
-        print $line;
-    }
-}
www.i-scream.org