X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ex%2FBeerDB.pm;h=1e4291a1410737bf1964b90d1f1012690f883d27;hb=88159aa11999cc57eb6ad0d6d4620bac638329d1;hp=f7a96904c70985801ff7e74bb1d09df17f24b2ff;hpb=d0870933fcb803bac8e31a30b785d1dff15c5278;p=maypole.git

diff --git a/ex/BeerDB.pm b/ex/BeerDB.pm
index f7a9690..1e4291a 100644
--- a/ex/BeerDB.pm
+++ b/ex/BeerDB.pm
@@ -1,24 +1,42 @@
 package BeerDB;
-use base 'Apache::MVC';
+use Maypole::Application;
 use Class::DBI::Loader::Relationship;
 
-# This is the sample application. Change this to the path to your
+sub debug { $ENV{BEERDB_DEBUG} }
+# This is the sample application.  Change this to the path to your
 # database. (or use mysql or something)
-BeerDB->setup("dbi:SQLite:t/beerdb.db");
-#BeerDB->setup("dbi:mysql:beerdb");
+use constant DBI_DRIVER => 'SQLite';
+use constant DATASOURCE => $ENV{BEERDB_DATASOURCE} || 't/beerdb.db';
+
+BEGIN {
+    my $dbi_driver = DBI_DRIVER;
+    if ($dbi_driver =~ /^SQLite/) {
+        die sprintf "SQLite datasource '%s' not found, correct the path or "
+            . "recreate the database by running Makefile.PL", DATASOURCE
+            unless -e DATASOURCE;
+        eval "require DBD::SQLite";
+        if ($@) {
+            eval "require DBD::SQLite2" and $dbi_driver = 'SQLite2';
+        }
+    }
+    BeerDB->setup(join ':', "dbi", $dbi_driver, DATASOURCE);
+}
+
+# Give it a name.
+BeerDB->config->application_name('The Beer Database');
 
 # Change this to the root of the web space.
-BeerDB->config->{uri_base} = "http://localhost/beerdb/";
-#BeerDB->config->{uri_base} = "http://neo.trinity-house.org.uk/beerdb/";
+BeerDB->config->uri_base("http://localhost/beerdb/");
+#BeerDB->config->uri_base("http://neo.trinity-house.org.uk/beerdb/");
 
-BeerDB->config->{rows_per_page} = 10;
+BeerDB->config->rows_per_page(10);
 
 # Handpumps should not show up.
-BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+BeerDB->config->display_tables([qw[beer brewery pub style]]);
 BeerDB::Brewery->untaint_columns( printable => [qw/name notes url/] );
 BeerDB::Style->untaint_columns( printable => [qw/name notes/] );
 BeerDB::Beer->untaint_columns(
-    printable => [qw/abv name price notes/],
+    printable => [qw/abv name price notes url/],
     integer => [qw/style brewery score/],
     date =>[ qw/date/],
 );
@@ -26,4 +44,9 @@ BeerDB->config->{loader}->relationship($_) for (
     "a brewery produces beers",
     "a style defines beers",
     "a pub has beers on handpumps");
+
+# For testing classmetadata
+sub BeerDB::Beer::classdata :Exported {};
+sub BeerDB::Beer::list_columns  { return qw/score name price style brewery url/};
+
 1;