X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ex%2FBeerDB.pm;h=e0b2894de09ebf11c3428675e8352d60c972262f;hb=a4c30c9757a710511bcfabe5cad9a7390eabfbcd;hp=778185a0b7e657336dabe63b8c55a2e7cea3eefa;hpb=3f7c99e168a1d75b133c1e2b25db7b170374d695;p=maypole.git

diff --git a/ex/BeerDB.pm b/ex/BeerDB.pm
index 778185a..e0b2894 100644
--- a/ex/BeerDB.pm
+++ b/ex/BeerDB.pm
@@ -2,12 +2,13 @@ package BeerDB;
 use Maypole::Application;
 use Class::DBI::Loader::Relationship;
 
-sub debug { $ENV{BEERDB_DEBUG} }
+sub debug { $ENV{BEERDB_DEBUG} || 0 }
 # This is the sample application.  Change this to the path to your
 # database. (or use mysql or something)
 use constant DBI_DRIVER => 'SQLite';
 use constant DATASOURCE => $ENV{BEERDB_DATASOURCE} || 't/beerdb.db';
 
+
 BEGIN {
     my $dbi_driver = DBI_DRIVER;
     if ($dbi_driver =~ /^SQLite/) {
@@ -29,8 +30,10 @@ BeerDB->config->application_name('The Beer Database');
 BeerDB->config->uri_base( $ENV{BEERDB_BASE} || "http://localhost/beerdb/" );
 
 # Change this to the htdoc root for your maypole application.
-BeerDB->config->template_root( $ENV{BEERDB_TEMPLATE_ROOT} ) if $ENV{BEERDB_TEMPLATE_ROOT};
 
+my @root=  ('t/templates'); 
+push @root,$ENV{BEERDB_TEMPLATE_ROOT} if ($ENV{BEERDB_TEMPLATE_ROOT});
+BeerDB->config->template_root( [@root] ); 
 # Specify the rows per page in search results, lists, etc : 10 is a nice round number
 BeerDB->config->rows_per_page(10);
 
@@ -41,10 +44,16 @@ BeerDB::Style->untaint_columns( printable => [qw/name notes/] );
 BeerDB::Beer->untaint_columns(
     printable => [qw/abv name price notes url/],
     integer => [qw/style brewery score/],
-    date =>[ qw/date/],
+    date =>[ qw/tasted/],
 );
 BeerDB::Pub->untaint_columns(printable => [qw/name notes url/]);
 
+# Required Fields
+BeerDB->config->{brewery}{required_cols} = [qw/name/];
+BeerDB->config->{style}{required_cols} = [qw/name/];
+BeerDB->config->{beer}{required_cols} = [qw/brewery name price/];
+BeerDB->config->{pub}{required_cols} = [qw/name/];
+
 BeerDB->config->{loader}->relationship($_) for (
     "a brewery produces beers",
     "a style defines beers",