X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;h=0a6c95b0be129cc08206caffb8e011391f875ebc;hb=5e9b1336d1f20d57953e3e419fa7d68e79723528;hp=54325616f90cac9dfcfaa5d3ff3474639a3cf0b1;hpb=ef3da5818c452a331e863d30efc41f5b65d0f624;p=maypole.git

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 5432561..0a6c95b 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
@@ -51,14 +53,26 @@ Surprisingly, this command causes a database record to be forever lost.
 
 =item search
 
+The search action 
+
+=back
+
 =head1 Helper Methods
 
+=over 
+
 =item order
 
 =item stringify_column
 
 =item do_pager
 
+=item related_class
+
+Given an accessor name as a method, this function returns the class this accessor returns.
+
+=back
+
 =cut
 
 sub related {
@@ -66,15 +80,17 @@ sub related {
     return keys %{ $self->meta_info('has_many') || {} };
 }
 
-#sub related_class {
-#    my ( $self, $r, $accessor ) = @_;
-#    my $related=$self->related->{$accessor};
-#    if ( my $mapping=$related->{args}->{mapping} ) {
-#	return	$related->{foreign_class}->meta_info('has_a')->{$$mapping[0]}->{foreign_class};
-#    } else { 
-#	return $related->{foreign_class};
-#    }
-#}
+sub related_class {
+    my ( $self, $r, $accessor ) = @_;
+    my $related = $self->related->{$accessor};
+    if ( my $mapping = $related->{args}->{mapping} ) {
+        return $related->{foreign_class}->meta_info('has_a')->{ $$mapping[0] }
+          ->{foreign_class};
+    }
+    else {
+        return $related->{foreign_class};
+    }
+}
 
 sub do_edit : Exported {
     my ( $self, $r ) = @_;
@@ -144,7 +160,7 @@ sub search : Exported {
     my $oper   = "like";                                # For now
     my %params = %{ $r->{params} };
     my %values = map { $_ => { $oper, $params{$_} } }
-      grep { $params{$_} and $fields{$_} } keys %params;
+      grep { length ($params{$_}) and $fields{$_} } keys %params;
 
     $r->template("list");
     if ( !%values ) { return $self->list($r) }
@@ -153,7 +169,7 @@ sub search : Exported {
     $r->objects(
         [
             $self->search_where(
-                \%values, ( $order ? { order => $order } : () )
+                \%values, ( $order ? { order_by => $order } : () )
             )
         ]
     );
@@ -192,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,
@@ -209,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 {
@@ -216,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;