seperate modules for backend-specific code

[perl/plp/.git] / PLP.pm

diff --git a/PLP.pm b/PLP.pm
index 8e6d188d23f567e779de6ccd29ab92aee52de147..2cb68eac81451b97a639a22936980de42d61d3ae 100644 (file)
--- a/PLP.pm
+++ b/PLP.pm
@@ -17,13 +17,10 @@ our $VERSION = '3.19';
 
 # Subs in this package:
 #  _default_error($plain, $html)    Default error handler
-#  cgi_init                         Initialization for CGI
 #  clean                            Reset variables
 #  error($error, $type)             Handle errors
 #  everything                       Do everything: CGI
 #  handler($r)                      Do everything: mod_perl
-#  mod_perl_init($r)                Initialization for mod_perl
-#  mod_perl_print                   Faster printing for mod_perl
 #  sendheaders                      Send headers
 #  source($path, $level, $linespec) Read and parse .plp files
 #  start                            Start the initialized PLP script
@@ -40,44 +37,6 @@ sub _default_error {
              qq{<b>Debug information:</b><br>$html</td></tr></table>};
 }
 
-# CGI initializer: parses PATH_TRANSLATED
-sub cgi_init {
-
-       $PLP::print = 'print';
-       
-       my $path = $ENV{PATH_TRANSLATED};
-       $ENV{PLP_NAME} = $ENV{PATH_INFO};
-       my $path_info;
-       while (not -f $path) {
-               if (not $path =~ s/(\/+[^\/]*)$//) {
-                       print STDERR "PLP: Not found: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
-                       PLP::error(undef, 404);
-                       exit;
-               }
-               my $pi = $1;
-               $ENV{PLP_NAME} =~ s/\Q$pi\E$//;
-               $path_info = $pi . $path_info;
-       }
-       
-       if (not -r $path) {
-               print STDERR "PLP: Can't read: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
-               PLP::error(undef, 403);
-               exit;
-       }
-
-       delete @ENV{
-               qw(PATH_TRANSLATED SCRIPT_NAME SCRIPT_FILENAME PATH_INFO),
-               grep /^REDIRECT_/, keys %ENV
-       };
-
-       $ENV{PATH_INFO} = $path_info if defined $path_info;
-       $ENV{PLP_FILENAME} = $path;
-       my ($file, $dir) = File::Basename::fileparse($path);
-       chdir $dir;
-
-       $PLP::code = PLP::source($file, 0, undef, $path);
-}
-
 # This cleans up from previous requests, and sets the default $PLP::DEBUG
 sub clean {
        @PLP::END = ();
@@ -123,16 +82,18 @@ sub error {
 
 # This is run by the CGI script. (#!perl \n use PLP; PLP::everything;)
 sub everything {
+       require PLP::CGI;
        clean();
-       cgi_init();
+       PLP::CGI::init();
        start();
 }
 
 # This is the mod_perl handler.
 sub handler {
+       require PLP::Apache;
        require Apache::Constants;
        clean();
-       if (my $ret = mod_perl_init($_[0])) {
+       if (my $ret = PLP::Apache::init($_[0])) {
                return $ret;
        }
        #S start($_[0]);
@@ -141,41 +102,6 @@ sub handler {
        return Apache::Constants::OK();
 }
 
-# mod_perl initializer: returns 0 on success, Apache error code on failure
-sub mod_perl_init {
-       our $r = shift;
-
-       $PLP::print = 'PLP::mod_perl_print';
-       
-       $ENV{PLP_FILENAME} = my $filename = $r->filename;
-       
-       unless (-f $filename) {
-               return Apache::Constants::NOT_FOUND();
-       }
-       unless (-r _) {
-               return Apache::Constants::FORBIDDEN();
-       }
-       
-       $ENV{PLP_NAME} = $r->uri;
-
-       our $use_cache = $r->dir_config('PLPcache') !~ /^off$/i;
-#S     our $use_safe  = $r->dir_config('PLPsafe')  =~ /^on$/i;
-       my $path = $r->filename();
-       my ($file, $dir) = File::Basename::fileparse($path);
-       chdir $dir;
-
-       $PLP::code = PLP::source($file, 0, undef, $path);
-
-       return 0; # OK
-}
-
-# FAST printing under mod_perl
-sub mod_perl_print {
-       return unless grep length, @_;
-       PLP::sendheaders() unless $PLP::sentheaders;
-       $PLP::r->print(@_);
-}
-
 # Sends the headers waiting in %PLP::Script::header
 sub sendheaders () {
        $PLP::sentheaders ||= [ caller 1 ? (caller 1)[1, 2] : (caller)[1, 2] ];