All patches applied except the losing of table list. A.
2008/5/29 Rob Edwards <[EMAIL PROTECTED]>: > ---------- Forwarded message ---------- > From: Rob Edwards <[EMAIL PROTECTED]> > Date: 2008/5/28 > Subject: a few patches > To: [email protected] > > > Hi, > > Some of these are just me scratching itches, trying to tidy up the logs a > bit.. > > * Removed available tables list in debug, is it really necessary? > > Maypole.pm: > > 829c829,832 > < $self->warn ("We don't have that table ($table)") if > $self->debug and not $ok_tables->{$table}; > --- >> $self->warn ("We don't have that table ($table).\n" >> . "Available tables are: " >> . join( ",", keys %$ok_tables )) >> if $self->debug and not $ok_tables->{$table}; > > > * included Apache2::Log if using mod_perl2 > * warn now splits \n over multiple lines > * fixed an undef cat warning when setting the content type on apache2 > > Apache/MVC.pm > > 14d13 > < use Apache2::Log; > 30a30 >> require Apache2::Log; > 118,127c118,120 > < my $ar = $self->parent ? $self->parent->{ar} : $self->{ar}; > < if ( $args[0] and ref $self ) { > < my @lines = split /\n/, (join > '', @args); > < $ar->warn("[$package line > $line] ".shift(@lines)); > < foreach(@lines) > < { > < > next unless $_; > < > $ar->warn($_); > < } > < > --- >> my $ar = $self->parent ? $self->parent->{ar} : $self->{ar}; >> if ( $args[0] and ref $self ) { >> $ar->warn("[$package line $line] ", @args) ; > 248,257c241,247 > < my $r = shift; > < > < $r->ar->content_type; > < $r->ar->content_type( > < > $r->content_type =~ m/^text/ > < > ? $r->content_type . "; charset=" . $r->document_encoding > < > : $r->content_type > < > ) if ($r->content_type); > < > < $r->ar->headers_out->set( > --- >> my $r = shift; >> $r->ar->content_type( >> $r->content_type =~ m/^text/ >> ? $r->content_type . "; charset=" . $r->document_encoding >> : $r->content_type >> ); >> $r->ar->headers_out->set( > > > > * Made the error template look *nice* :P > * Added TT options to prevent too much ws > > Maypole/View/TT.pm > > 20c20 > < my $view_options = $r->config->view_options || {POST_CHOMP=>1, > PRE_CHOMP=>1, TRIM=>1}; > --- >> my $view_options = $r->config->view_options || {}; > 72c72 > < $r->warn("error : $error\n"); > --- >> $r->warn("report_error - reporting error to user : $error\n"); > 78c78 > < paths => join (', ',$self->paths($r)), > --- >> paths => [ $self->paths($r) ], > 401c401 > < <html><head><title>Maypole Error Page</title> > --- >> <html><head><title>Maypole error page</title> > 403,407c403,409 > < body { background-color:#fff; font-family: sans-serif} > < p { background-color: #e3eaf0; padding: 5px; } > < pre { background-color: #e3eaf0; padding: 5px; border: 1px dotted red } > < .lhs {background-color: #b5cadc; } > < .rhs {background-color: #e3eaf0; } > --- >> body { background-color:#7d95b5; font-family: sans-serif} >> p { background-color: #fff; padding: 5px; } >> pre { background-color: #fff; padding: 5px; border: 1px dotted black } >> h1 { color: #fff } >> h2 { color: #fff } >> .lhs {background-color: #ffd; } >> .rhs {background-color: #dff; } > 410c412 > < <h1> Maypole Application Error </h1> > --- >> <h1> Maypole application error </h1> > 428c430 > < <table width="100%" cellspacing="2" cellpadding="1"> > --- >> <table width="85%" cellspacing="2" cellpadding="1"> > 431c433 > < <tr> <td class="lhs" width="20%"> <b>[% attribute %]</b> </td> > <td class="rhs" width="65%"> [% > --- >> <tr> <td class="lhs" width="35%"> <b>[% attribute %]</b> </td> <td >> class="rhs" width="65%"> [% > 437c439 > < <tr> <td class="lhs" width="20%">[% param.key %]</td> <td > class="rhs" width="65%"> [% param.value %] </td></tr> > --- >> <tr> <td class="lhs" width="35%">[% param.key %]</td> <td class="rhs" >> width="65%"> [% param.value %] </td></tr> > 442,444c444,446 > < <table width="100%" cellspacing="2" cellpadding="1"> > < <tr><td class="lhs" width="20%"> <b>Base URI</b> </td><td > class="rhs" width="65%">[% request.config.uri_base %]</td></tr> > < <tr><td class="lhs" width="20%"> <b>Paths</b> </td><td class="rhs" > width="65%"> [% paths %] </td></tr> > --- >> <table width="85%" cellspacing="2" cellpadding="1"> >> <tr><td class="lhs" width="35%"> <b>Base URI</b> </td><td class="rhs" >> width="65%">[% request.config.uri_base %]</td></tr> >> <tr><td class="lhs" width="35%"> <b>Paths</b> </td><td class="rhs" >> width="65%"> [% paths %] </td></tr> > 448,452c450,454 > < <table width="100%" cellspacing="2" cellpadding="1"> > < <tr><td class="lhs" width="20%"> <b>Model </b> </td><td > class="rhs" width="65%"> [% request.config.model %] </td></tr> > < <tr><td class="lhs" width="20%"> <b>View </b> </td><td > class="rhs" width="65%"> [% request.config.view %] </td></tr> > < <tr><td class="lhs" width="20%"> <b>Classes</b> </td><td > class="rhs" width="65%"> [% request.config.classes.list.join(" , ") %] > </td></tr> > < <tr><td class="lhs" width="20%"> <b>Tables</b> </td><td > class="rhs" width="65%"> [% request.config.display_tables.list.join(" > , ") %] </td></tr> > --- >> <table width="85%" cellspacing="2" cellpadding="1"> >> <tr><td class="lhs" width="35%"> <b>Model </b> </td><td class="rhs" >> width="65%"> [% request.config.model %] </td></tr> >> <tr><td class="lhs" width="35%"> <b>View </b> </td><td class="rhs" >> width="65%"> [% request.config.view %] </td></tr> >> <tr><td class="lhs" width="35%"> <b>Classes</b> </td><td class="rhs" >> width="65%"> [% request.config.classes.list.join(" , ") %] </td></tr> >> <tr><td class="lhs" width="35%"> <b>Tables</b> </td><td class="rhs" >> width="65%"> [% request.config.display_tables.list.join(" , ") %] </td></tr> > > * fixed undef warning > > Maypole/Model/CDBI/AsForm.pm > > 883c883 > < if ($args->{column_nullable} || !defined $args->{value}) { > --- >> if ($args->{column_nullable} || $args->{value} eq '') { > 885c885 > < $null->attr('selected', 'selected') if !defined $args->{value}; > --- >> $null->attr('selected', 'selected') if $args->{value} eq ''; > -- http://www.aarontrevena.co.uk LAMP System Integration, Development and Hosting ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Maypole-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/maypole-devel
