X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;h=8b753df5432b058f53b5e56a353a4f06b55fcc00;hb=fb48746a79e660e7f5df5a22269ca9e22519eaa5;hp=43b8c7be0d808b22879d7d1edc24e357a984fbfe;hpb=48b7f94a68422ee2d1ee9ca6bf9cd5c2ee34e189;p=maypole.git

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 43b8c7b..8b753df 100644
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -35,17 +35,15 @@ sub related {
 sub do_edit :Exported {
     my ($self, $r) = @_;
     my $h = CGI::Untaint->new(%{$r->{params}});
-    my ($obj) = @{$r->objects};
+    my ($obj) = @{$r->objects || []};
     if ($obj) {
         # We have something to edit
         $obj->update_from_cgi($h);
-        warn "Updating an object ($obj) with ".Dumper($h); use Data::Dumper;
     } else {
         $obj = $self->create_from_cgi($h);
     }
     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} = $r->{params};
         $r->{template_args}{errors} = \%errors;
         $r->{template} = "edit";
@@ -56,56 +54,86 @@ sub do_edit :Exported {
 }
 
 sub delete :Exported {
+    return shift->SUPER::delete(@_) if caller ne "Maypole::Model::Base";
     my ($self, $r) = @_;
-    $_->SUPER::delete for @{ $r->objects };
+    $_->SUPER::delete for @{ $r->objects || [] };
     $r->objects([ $self->retrieve_all ]);
     $r->{template} = "list";
+    $self->list($r);
+}
+
+sub stringify_column {
+    my $class = shift;
+    return ($class->columns("Stringify"),
+                (grep { $_ ne "id" } $class->primary_columns),
+                (grep { $_ eq "name" } $class->columns)
+               )[0];
 }
 
 sub adopt {
     my ($self, $child) = @_;
     $child->autoupdate(1);
-    $child->columns( Stringify => qw/ name / );
+    if (my $col = $child->stringify_column) {
+        $child->columns( Stringify => $col );
+    }
 }
 
 sub search :Exported {
-    return shift->SUPER::search(@_) if caller eq "Class::DBI"; # oops
+    return shift->SUPER::search(@_) if caller ne "Maypole::Model::Base";
+                                    # A real CDBI search.
     my ($self, $r) = @_;
     my %fields = map {$_ => 1 } $self->columns;
     my $oper = "like"; # For now
-    use Carp; Carp::confess("Urgh") unless ref $r;
     my %params = %{$r->{params}};
     my %values = map { $_ => {$oper, $params{$_} } }
                  grep { $params{$_} and $fields{$_} } keys %params;
 
-    $r->objects([ %values ? $self->search_where(%values) : $self->retrieve_all ]);
     $r->template("list");
+    if (!%values) { return $self->list($r) }
+    my $order = $self->order($r);
+    $self = $self->do_pager($r);
+    $r->objects([ $self->search_where(\%values), 
+                  ($order ? { order => $order } : ())  
+                ]);
     $r->{template_args}{search} = 1;
 }
 
-sub list :Exported {
+sub do_pager {
     my ($self, $r) = @_;
-    my %ok_columns = map {$_ => 1} $self->columns;
     if ( my $rows = $r->config->{rows_per_page}) {
-        $self = $self->pager($rows, $r->query->{page});
-        $r->{template_args}{pager} = $self;
-    } 
+        return $r->{template_args}{pager} = $self->pager($rows, $r->query->{page});
+    } else { return $self } 
+}
+
+sub order {
+    my ($self, $r) = @_;
     my $order;
+    my %ok_columns = map {$_ => 1} $self->columns;
     if ($order = $r->query->{order} and $ok_columns{$order}) {
-        $r->objects([ $self->retrieve_all_sorted_by( $order.
-            ($r->query->{o2} eq "desc" && " DESC")
-        )]);
+       $order .= ($r->query->{o2} eq "desc" && " DESC")
+    }
+    $order;
+}
+
+sub list :Exported {
+    my ($self, $r) = @_;
+    my $order = $self->order($r);
+    $self = $self->do_pager($r);
+    if ($order) { 
+        $r->objects([ $self->retrieve_all_sorted_by( $order )]);
     } else {
         $r->objects([ $self->retrieve_all ]);
     }
 }
 
 sub setup_database {
-    my ($self, $config, $namespace, $dsn) = @_;
+    my ($self, $config, $namespace, $dsn, $u, $p) = @_;
     $config->{dsn} = $dsn;
     $config->{loader} = Class::DBI::Loader->new(
         namespace => $namespace,
-        dsn => $dsn
+        dsn => $dsn,
+        user => $u,
+        password => $p,
     );
     $config->{classes} = [ $config->{loader}->classes ];
     $config->{tables}  = [ $config->{loader}->tables ];