Fixed ordering of Dave's parse_location patch

[maypole.git] / lib / CGI / Maypole.pm

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index ddcf22240019251a6f11d035312aeba3adc262c4..39514f97cb763550eb03f46451fcaaaeb36a4597 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -21,8 +21,8 @@ sub parse_location {
     $self->{path} = $self->{cgi}->url( -absolute => 1, -path_info => 1 );
     my $loc = $self->{cgi}->url( -absolute => 1 );
     no warnings 'uninitialized';
-    $self->{path} =~ s/^($loc)?\///;
     $self->{path} .= '/' if $self->{path} eq $loc;
+    $self->{path} =~ s/^($loc)?\///;
     $self->parse_path;
     $self->parse_args;
 }
@@ -62,10 +62,11 @@ CGI::Maypole - CGI-based front-end to Maypole
 =head1 SYNOPSIS
 
      package BeerDB;
-     use base 'CGI::Maypole;
+     use base 'CGI::Maypole';
      BeerDB->setup("dbi:mysql:beerdb");
      BeerDB->config->uri_base("http://your.site/cgi-bin/beer.cgi/");
      BeerDB->config->display_tables([qw[beer brewery pub style]]);
+     BeerDB->config->template_root("/var/www/beerdb/");
      # Now set up your database:
      # has-a relationships
      # untaint columns
@@ -73,12 +74,15 @@ CGI::Maypole - CGI-based front-end to Maypole
      1;
 
      ## example beer.cgi:
-       
+
      #!/usr/bin/perl -w
      use strict;
      use BeerDB;
      BeerDB->run();
 
+Now to access the beer database, type this URL into your browser:
+http://your.site/cgi-bin/beer.cgi/frontpage
+
 =head1 DESCRIPTION
 
 This is a handler for Maypole which will use the CGI instead of Apache's