X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;h=4a83bcb08f5c402c91bb22bd04497a5208dde688;hb=2753043a08e24e59b8f068f00bc72b4eb21190ae;hp=f409fff2a0404f7d2dc56369cd04dcbdd23c40d4;hpb=7dda5e1451220612c6ad749746d84e4c090e330c;p=maypole.git

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index f409fff..4a83bcb 100644
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -39,6 +39,8 @@ See L<Maypole::Model::Base> for these:
 
 =item setup_database
 
+=item fetch_objects
+
 =back 
 
 =head1 Additional Commands
@@ -158,7 +160,7 @@ sub search : Exported {
     my $oper   = "like";                                # For now
     my %params = %{ $r->{params} };
     my %values = map { $_ => { $oper, $params{$_} } }
-      grep { defined $params{$_} and $fields{$_} } keys %params;
+      grep { length ($params{$_}) and $fields{$_} } keys %params;
 
     $r->template("list");
     if ( !%values ) { return $self->list($r) }
@@ -167,7 +169,7 @@ sub search : Exported {
     $r->objects(
         [
             $self->search_where(
-                \%values, ( $order ? { order => $order } : () )
+                \%values, ( $order ? { order_by => $order } : () )
             )
         ]
     );
@@ -206,12 +208,13 @@ sub list : Exported {
 }
 
 sub setup_database {
-    my ( $self, $config, $namespace, $dsn, $u, $p, $opts ) = @_;
+    my ( $class, $config, $namespace, $dsn, $u, $p, $opts ) = @_;
     $dsn  ||= $config->dsn;
     $u    ||= $config->user;
     $p    ||= $config->pass;
     $opts ||= $config->opts;
     $config->dsn($dsn);
+    warn "No DSN set in config" unless $dsn;
     $config->loader || $config->loader(
         Class::DBI::Loader->new(
             namespace => $namespace,
@@ -223,6 +226,8 @@ sub setup_database {
     );
     $config->{classes} = [ $config->{loader}->classes ];
     $config->{tables}  = [ $config->{loader}->tables ];
+    warn( 'Loaded tables: ' . join ',', @{ $config->{tables} } )
+      if $namespace->debug;
 }
 
 sub class_of {
@@ -230,5 +235,15 @@ sub class_of {
     return $r->config->loader->_table2class($table);
 }
 
-1;
+sub fetch_objects {
+    my ($class,$r)=@_;
+    my @pcs = $class->primary_columns;
+    if ( $#pcs ) {
+    my %pks;
+        @pks{@pcs}=(@{$r->{args}});
+        return $class->retrieve( %pks );
+    }
+    return $class->retrieve( %$r->{args}->[0] );
+}
 
+1;