X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC%2FModel%2FCDBI.pm;h=854118e1559f2007fda5983a31a41b2708a604ae;hb=5cccc5a89004f9c514e9d611b5e2a02e9aa28ece;hp=88c1d5282769240dcf338316d64b8465dfb37045;hpb=7afc363f8b7cd7b710d4ee4199976165363bcfab;p=maypole.git

diff --git a/lib/Apache/MVC/Model/CDBI.pm b/lib/Apache/MVC/Model/CDBI.pm
index 88c1d52..854118e 100644
--- a/lib/Apache/MVC/Model/CDBI.pm
+++ b/lib/Apache/MVC/Model/CDBI.pm
@@ -3,17 +3,23 @@ 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 Class::DBI::Pager;
 use CGI::Untaint;
 use strict;
 
-sub description { "A poorly defined class" }
+=head1 NAME
 
-sub column_names { my $class = shift; map { $_ => ucfirst $_ } $class->columns }
+Apache::MVC::Model::CDBI - Model class based on Class::DBI
 
-sub get_objects {
-    my ($self, $r) = @_;
-    return $self->retrieve(shift @{$r->{args}});
-}
+=head1 DESCRIPTION
+
+This is a master model class which uses C<Class::DBI> to do all the hard
+work of fetching rows and representing them as objects. It is a good
+model to copy if you're replacing it with other database abstraction
+modules.
+
+=cut
 
 sub related {
     my ($self, $r) = @_;
@@ -61,14 +67,27 @@ sub adopt {
 }
 
 sub search :Exported {
+    return shift->SUPER::search(@_) if caller eq "Class::DBI"; # oops
     my ($self, $r) = @_;
     my %fields = map {$_ => 1 } $self->columns;
-    my %values = map { $_ => $params{$_} }
-                 grep { $params{$_} and $fields{$_} } keys %{$r->{params}};
-    $r->objects([ %values ? $self->search_like(%values) : $self->retrieve_all ]);
+    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");
     $r->{template_args}{search} = 1;
 }
 
-
+sub list :Exported {
+    my ($self, $r) = @_;
+    if ( my $rows = $r->config->{rows_per_page}) {
+        $self = $self->pager($rows, $r->query->{page});
+        $r->{template_args}{pager} = $self;
+    } 
+    $r->objects([ $self->retrieve_all ]);
+}
 1;
+