modified web commands to run in apache and httpi

diff --git a/web/htdocs/index.pl b/web/htdocs/index.pl
index 9925f91b771ee187a1102011a22fe78062c684b2..33ebd91b92775ad30a707fc28ae27007b053ba00 100755 (executable)
--- a/web/htdocs/index.pl
+++ b/web/htdocs/index.pl
@@ -1,11 +1,12 @@
 #!/usr/bin/perl
+use CGI::Carp qw(warningsToBrowser fatalsToBrowser); 
 if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
   print "HTTP/1.0 200 OK\n";
   print header("text/html");
   }
 else {
   print "Content-type: text/html\n\n";
-  use if (!$ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i), apacheEnv;
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
   }
 
 

diff --git a/web/htdocs/mvd/cb_controller.pl b/web/htdocs/mvd/cb_controller.pl
index 6f4fcde4cc5e483cfff8896ba4d8d77d3b3f6bec..50b96424a4c9ee08ace00c3f1eb1f48797c4d8ba 100755 (executable)
--- a/web/htdocs/mvd/cb_controller.pl
+++ b/web/htdocs/mvd/cb_controller.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/mvd/jtag.pl b/web/htdocs/mvd/jtag.pl
index 0b8477a262d945c2c1bf1ecf93a9453bf14a47fc..0b528d5e57f0911db66c10f082877de90667e7df 100755 (executable)
--- a/web/htdocs/mvd/jtag.pl
+++ b/web/htdocs/mvd/jtag.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/mvd/roc.pl b/web/htdocs/mvd/roc.pl
index b290bf9bda4a6a88ea8b0adc4284e61bf15c681b..194ba2f8448ef46587da3926a526420b0de44e7f 100755 (executable)
--- a/web/htdocs/mvd/roc.pl
+++ b/web/htdocs/mvd/roc.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/network/generic.pl b/web/htdocs/network/generic.pl
index 55156bf67b7d8b56db6268d894570fe5d3b092fc..cb3e0706c216b43bf0aa390008e217c9a40770e2 100755 (executable)
--- a/web/htdocs/network/generic.pl
+++ b/web/htdocs/network/generic.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/network/hub.pl b/web/htdocs/network/hub.pl
index 3e23e28f574c516e23c497cf3688d95ca442d81d..9fa929f25311471dd713da688909d0b2d00dcf39 100755 (executable)
--- a/web/htdocs/network/hub.pl
+++ b/web/htdocs/network/hub.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/network/trbnet.pl b/web/htdocs/network/trbnet.pl
index 2a89f94099eacf9bdf4de8b287f189e7400be5d6..71e48b1c0eabbf7a58ca1243458675f3a8d53f29 100755 (executable)
--- a/web/htdocs/network/trbnet.pl
+++ b/web/htdocs/network/trbnet.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 52f2bb1b02d6b7c143f5e06a4acc0c7d50499516..f4e8f23a5107aa7a677a5b28e52d8c512d965329 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;

diff --git a/web/htdocs/tdc/tdcstatctrl.pl b/web/htdocs/tdc/tdcstatctrl.pl
index f5cc4150180a05013f282ac316f09d1c16ed1517..0de51eda401987f316e49de4e25fca1fa7451bd1 100755 (executable)
--- a/web/htdocs/tdc/tdcstatctrl.pl
+++ b/web/htdocs/tdc/tdcstatctrl.pl
@@ -1,6 +1,13 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
+#!/usr/bin/perl
+if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
+  print "HTTP/1.0 200 OK\n";
+  print header("text/html");
+  }
+else {
+  use lib '..';
+  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+  print "Content-type: text/html\n\n";
+  }
 
 use CGI ':standard';
 use XML::LibXML;