Use abstract search instead; more flexible.

[maypole.git] / lib / Apache / MVC / Model / CDBI.pm

diff --git a/lib/Apache/MVC/Model/CDBI.pm b/lib/Apache/MVC/Model/CDBI.pm
index 833550d5a059a0297973069bb144d80adb89685d..4d6339d1745b0201d4e9c6655051b79f26fe751e 100644 (file)
--- a/lib/Apache/MVC/Model/CDBI.pm
+++ b/lib/Apache/MVC/Model/CDBI.pm
@@ -1,8 +1,11 @@
 package Apache::MVC::Model::CDBI;
-use base 'Apache::MVC::Model::Base';
+use base qw(Apache::MVC::Model::Base Class::DBI);
+use Lingua::EN::Inflect::Number qw(to_PL);
 use Class::DBI::AsForm;
 use Class::DBI::FromCGI;
+use Class::DBI::AbstractSearch;
 use CGI::Untaint;
+use strict;
 
 sub description { "A poorly defined class" }
 
@@ -13,13 +16,21 @@ sub get_objects {
     return $self->retrieve(shift @{$r->{args}});
 }
 
+sub related {
+    my ($self, $r) = @_;
+    # Has-many methods; XXX this is a hack
+    map {to_PL($_)} 
+    grep { exists $r->{config}{ok_tables}{$_} }
+    map {$_->table}
+    keys %{shift->__hasa_list || {}}
+}
+
 sub do_edit :Exported {
     my ($self, $r) = @_;
     my $h = CGI::Untaint->new(%{$r->{params}});
-    my $obj;
-    if (@{$r->{args}}) {
+    my ($obj) = @{$r->objects};
+    if ($obj) {
         # We have something to edit
-        ($obj) = @{$self->objects};
         $obj->update_from_cgi($h);
         warn "Updating an object ($obj) with ".Dumper($h); use Data::Dumper;
     } else {
@@ -28,18 +39,18 @@ sub do_edit :Exported {
     if (my %errors = $obj->cgi_update_errors) {
         # Set it up as it was:
         warn "There were errors: ".Dumper(\%errors)."\n";
-        $r->{template_args}{cgi_params} = \%params;
+        $r->{template_args}{cgi_params} = $r->{params};
         $r->{template_args}{errors} = \%errors;
         $r->{template} = "edit";
     } else {
         $r->{template} = "view";
     }
-    return $obj;
+    $r->objects([ $obj ]);
 }
 
 sub delete :Exported {
     my ($self, $r) = @_;
-    $self->delete for @{ $r->objects };
+    $_->SUPER::delete for @{ $r->objects };
     $r->objects([ $self->retrieve_all ]);
     $r->{template} = "list";
 }
@@ -50,4 +61,19 @@ sub adopt {
     $child->columns( Stringify => qw/ name / );
 }
 
+sub search :Exported {
+    my ($self, $r) = @_;
+    my %fields = map {$_ => 1 } $self->columns;
+    my $oper = "like"; # For now
+    my %params = %{$r->{params}};
+    my %values = map { $_ => {$oper, $oper eq "like" ? "%".$params{$_}."%" 
+                                                     :$params{$_} } }
+                 grep { $params{$_} and $fields{$_} } keys %params;
+
+    $r->objects([ %values ? $self->search_where(%values) : $self->retrieve_all ]);
+    $r->template("list");
+    $r->{template_args}{search} = 1;
+}
+
+
 1;