Exorcising some SP environment variables.

1 files changed, 11 insertions, 10 deletions

diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index bc6dba2..242613f 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -8,7 +8,7 @@
 # This source code is available under the license at:
 #     http://www.w3.org/Consortium/Legal/copyright-software
 #
-# $Id: check,v 1.103 2001-05-27 05:35:22 link Exp $
+# $Id: check,v 1.104 2001-05-27 11:05:39 link Exp $
 
 #
 # We need Perl 5.004.
@@ -75,9 +75,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/';
 
 #
 # Strings
-$VERSION    =  q$Revision: 1.103 $;
+$VERSION    =  q$Revision: 1.104 $;
 $VERSION    =~ s/Revision: ([\d\.]+) /$1/;
-$DATE       =  q$Date: 2001-05-27 05:35:22 $;
+$DATE       =  q$Date: 2001-05-27 11:05:39 $;
 $MAINTAINER =  'gerald@w3.org';
 $NOTICE     =  ''; # "<p><strong>Note: This service will be ...</strong>";
 
@@ -362,10 +362,11 @@ print(' ' x 4, q(<li>Content length: ), $File->{Size},     qq(</li>\n))
 my $xmlflags = '';
 my $decl     = '';
 my $catalog  = '';
+my $path     = $sgmlstuff;
 
 if ($File->{Type} eq 'xhtml') {
-  $ENV{SGML_CATALOG_FILES} = $sgmlstuff . '/REC-xhtml1-20000126/xhtml.soc';
-  $ENV{SGML_SEARCH_PATH} = $sgmlstuff . '/REC-xhtml1-20000126/';
+  $catalog               = $sgmlstuff . '/REC-xhtml1-20000126/xhtml.soc';
+  $path                  = $sgmlstuff . '/REC-xhtml1-20000126/';
   $ENV{SP_CHARSET_FIXED} = 'YES';
   $ENV{SP_ENCODING}      = 'UTF-8';
   $xmlflags              = '-wxml ';
@@ -374,25 +375,25 @@ if ($File->{Type} eq 'xhtml') {
   }
   $decl                  = $xhtmldecl;
 } elsif ($File->{Type} eq 'mathml') {
-  $catalog = "-c $sgmlstuff/CR-MathML2-20001113/catalog";
+  $catalog               = $sgmlstuff . '/CR-MathML2-20001113/catalog';
   $ENV{SP_CHARSET_FIXED} = 'YES';
   $ENV{SP_ENCODING}      = 'XML';
   $xmlflags              = '-wxml ';
 } elsif ($File->{Type} eq 'xml' or $guessed_doctype == 2) {
   # no doctype, with xmlns attr on 1st element
   $File->{Type} = 'xml'; # @@ probably a better way to do this
-  $ENV{SGML_CATALOG_FILES} = $sgmlstuff . '/sp-1.3/pubtext/xml.soc';
-  $ENV{SGML_SEARCH_PATH} = $sgmlstuff . '/sp-1.3/pubtext/';
+  $catalog               = $sgmlstuff . '/sp-1.3/pubtext/xml.soc';
+  $path                  = $sgmlstuff . '/sp-1.3/pubtext/';
   $ENV{SP_CHARSET_FIXED} = 'YES';
   $ENV{SP_ENCODING}      = 'XML';
   $xmlflags              = '-wxml -wno-valid ';
   $decl                  = $xmldecl;
 } else { # must be HTML (for now)
   $decl    = $sgmldecl;
-  $catalog = "-c $sgmlstuff/catalog";
+  $catalog = $sgmlstuff . '/catalog';
 }
 
-my $command  = "$sp -f$temp -E0 $xmlflags $catalog $decl";
+my $command  = "$sp -f$temp -E0 $xmlflags -c $catalog -D $path $decl";
 
 if ( $ENV{SERVER_PORT} eq "8000" ) {	# running on the test server?
     print "    <li>nsgmls command line: <code>$command</code>\n";