added dfv check method to DFV model

[maypole.git] / lib / Maypole / Model / CDBI / DFV.pm

diff --git a/lib/Maypole/Model/CDBI/DFV.pm b/lib/Maypole/Model/CDBI/DFV.pm
index a6b12b3dfff8379a6cb0aebf693cc338ec1410cd..eb2bf20668834329b18f692042fa03ae13c931f5 100644 (file)
--- a/lib/Maypole/Model/CDBI/DFV.pm
+++ b/lib/Maypole/Model/CDBI/DFV.pm
@@ -96,6 +96,21 @@ sub adopt {
     }
 }
 
+=head2 check_params
+
+  Checks parameters against the DFV profile for the class, returns the results
+  of DFV's check.
+
+  my $dfv_results = __PACKAGE__->check_params($r->params);
+
+=cut
+
+sub check_params {
+  my ($class,$params) = @_;
+  return Data::FormValidator->check($params, $class->dfv_profile);
+}
+
+
 =head1 Action Methods
 
 Action methods are methods that are accessed through web (or other public) interface.
@@ -125,7 +140,6 @@ sub do_edit : Exported {
     return;
   }
 
-  my $required_cols = $class->required_columns;
   my $errors;
   if ($obj) {
     ($obj,$errors) = $class->_do_update($r,$obj);
@@ -204,28 +218,22 @@ sub _do_create {
   my ($class,$r) = @_;
   my $errors;
   my $this_class_params = { map { $_ => $r->{params}{$_} }  $class->columns  };
-  my $dfv_results;
   my $obj;
 
-  if ($class->isa('Class::DBI::DFV')) {
-    $obj = eval { My::DBI->create( $this_class_params ) };
-    $dfv_results = ($obj) ? undef :  $class->dfv_results ;
+  my $dfv_results = Data::FormValidator->check($r->{params}, $class->dfv_profile);
+  if ($dfv_results->success) {
+    $obj = $class->create($this_class_params);
   } else {
-    $dfv_results = Data::FormValidator->check($r->{params}, $class->dfv_profile);
-    if ($dfv_results->success) {
-      $obj = $class->create($this_class_params);
-    }
-  }
-
-  # handle dfv errors
-  if ( $dfv_results->has_missing ) {   # missing fields
-    foreach my $field ( $dfv_results->missing ) {
-      $errors->{$field} = "$field is required";
+    # handle dfv errors
+    if ( $dfv_results->has_missing ) {   # missing fields
+      foreach my $field ( $dfv_results->missing ) {
+       $errors->{$field} = "$field is required";
+      }
     }
-  }
-  if ( $dfv_results->has_invalid ) {   # Print the name of invalid fields
-    foreach my $field ( $dfv_results->invalid ) {
-      $errors->{$field} =  "$field is invalid: " . $dfv_results->invalid( $field );
+    if ( $dfv_results->has_invalid ) {   # Print the name of invalid fields
+      foreach my $field ( $dfv_results->invalid ) {
+       $errors->{$field} =  "$field is invalid: " . $dfv_results->invalid( $field );
+      }
     }
   }