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 1cc60ba6d7d8567d85df70eca0b942a87218a75a..39514f97cb763550eb03f46451fcaaaeb36a4597 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -4,7 +4,7 @@ use base 'Maypole';
 use strict;
 use warnings;
 
-our $VERSION = '2.03';
+our $VERSION = '2.05';
 
 sub run {
     my $self = shift;
@@ -21,6 +21,7 @@ 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} .= '/' if $self->{path} eq $loc;
     $self->{path} =~ s/^($loc)?\///;
     $self->parse_path;
     $self->parse_args;
@@ -42,7 +43,7 @@ sub send_output {
     print $r->{cgi}->header(
         -type           => $r->{content_type},
         -charset        => $r->{document_encoding},
-        -content_length => length $r->{output},
+        -content_length => do { use bytes; length $r->{output} }, 
     );
     print $r->{output};
 }
@@ -61,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
@@ -72,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