Location handling stuff.

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@11 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 42d0d9102bbf4533526faa53f97dbe421b467e8d..7869cfa45125630b03ed96f7b5d58ace40a7d501 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -90,9 +90,7 @@ sub get_request {
 
 sub parse_location {
     my $self = shift;
-    my $uri = $self->{ar}->uri();
-    my $loc = $self->{ar}->location();
-    $uri =~ s/^$loc//;
+    my $uri = $self->{ar}->path_info();
     my @pi = split /\//, $uri;
     shift @pi while @pi and !$pi[0];
     $self->{table} = shift @pi;

diff --git a/lib/Apache/MVC/View/TT.pm b/lib/Apache/MVC/View/TT.pm
index f1b005e8108ac5a37260cdf2a77874b4bd235b08..368c3ecc330546b01b42466788825ade02f16ddd 100644 (file)
--- a/lib/Apache/MVC/View/TT.pm
+++ b/lib/Apache/MVC/View/TT.pm
@@ -26,6 +26,7 @@ sub _args {
         request => $r,
         class   => $class,
         objects => $r->objects,
+        base    => $r->config->{uri_base},
         # ...
     );
     $args{classmetadata} = {

diff --git a/lib/BeerDB.pm b/lib/BeerDB.pm
index c69e2dc9be87a381e290a286aac575639808df07..5cb320a4ecb29b5914690007959a18424dfe7dae 100644 (file)
--- a/lib/BeerDB.pm
+++ b/lib/BeerDB.pm
@@ -5,6 +5,8 @@ use base 'Apache::MVC';
 sub handler { Apache::MVC::handler("BeerDB", @_) }
 BeerDB->set_database("dbi:SQLite:dbname=/opt/beer/beerdb.db");
 BeerDB->config->{template_root} = "/opt/beer";
+BeerDB->config->{uri_base} = "http://neo.trinity-house.org.uk/beerdb/";
+
 BeerDB::Brewery->columns(Stringify => qw/name/);
 
 BeerDB->config->{loader}->relationship( "a brewery produces beers" );