X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=42d0d9102bbf4533526faa53f97dbe421b467e8d;hb=58398cbb7b75bf3106e8503b81ee782178c248c3;hp=95e3dd3f131b4a3791348cd636e8ba88b2f0ffac;hpb=fa685ce517bd35c12ed6681803d9d0d6b1793159;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 95e3dd3..42d0d91 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -7,13 +7,21 @@ use Apache::Constants ":common";
 use strict;
 use warnings;
 our $VERSION = "1.0";
-
 __PACKAGE__->mk_classdata($_) for qw( _config init_done view_object );
 __PACKAGE__->mk_accessors ( qw( config ar params objects model_class
 args action template ));
 __PACKAGE__->config({});
 __PACKAGE__->init_done(0);
 
+
+sub import {
+    my $real = shift;
+    if ($real ne "Apache::MVC") {
+        no strict 'refs';
+        *{$real."::handler"} = sub { Apache::MVC::handler($real, @_) };
+    }
+}
+
 # This is really dirty.
 sub config {
     my $self = shift;
@@ -56,18 +64,19 @@ sub class_of {
 
 sub handler {
     # See Apache::MVC::Workflow before trying to understand this.
-    # XXX This needs to work with Apache without method handlers
     my $class = shift;
     $class->init unless $class->init_done;
     my $r = bless { config => $class->config }, $class;
     $r->get_request();
     $r->parse_location();
+
     $r->model_class($r->class_of($r->{table}));
     my $status = $r->is_applicable;
     return $status unless $status == OK;
     $status = $r->call_authenticate;
     return $status unless $status == OK;
     $r->additional_data();
+    
     $r->model_class->process($r);
     $r->view_object->process($r);
     return $r; # For debugging.
@@ -81,7 +90,10 @@ sub get_request {
 
 sub parse_location {
     my $self = shift;
-    my @pi = split /\//, $self->{ar}->uri();
+    my $uri = $self->{ar}->uri();
+    my $loc = $self->{ar}->location();
+    $uri =~ s/^$loc//;
+    my @pi = split /\//, $uri;
     shift @pi while @pi and !$pi[0];
     $self->{table} = shift @pi;
     $self->{action} = shift @pi;