cleanup nach jedem import

[mfinanz.git] / SL / Controller / CsvImport.pm

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 24c76ab3ddc6a25de6dd4fdec0022651290e7d51..8834b2024ca455afc5e570ae51688130df285352 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -38,6 +38,8 @@ __PACKAGE__->run_before('ensure_form_structure');
 __PACKAGE__->run_before('check_type', except => [ qw(report) ]);
 __PACKAGE__->run_before('load_all_profiles');
 
+__PACKAGE__->run_after('cleanup_reports');
+
 #
 # actions
 #
@@ -96,7 +98,7 @@ sub action_result {
   }
 
   if ($data->{progress}{finished} || $data->{errors}) {
-    $self->action_report(report_id => $data->{report_id}, no_layout => 1);
+    $self->render('csv_import/_deferred_report', { no_layout => 1 });
   } else {
     $self->render('csv_import/_deferred_results', { no_layout => 1 });
   }
@@ -165,10 +167,9 @@ sub action_report {
   $self->{report_rows}   = $self->{report}->folded_rows(rows => $rows);
   $self->{report_status} = $self->{report}->folded_status(status => $status);
   $self->{pages} = $pages;
+  $self->{base_url} = $self->url_for(action => 'report', id => $report_id, no_layout => $params{no_layout} || $::form->{no_layout} );
 
-  my $base_url = $self->url_for(action => 'report', id => $report_id);
-
-  $self->render('csv_import/report', { no_layout => $params{no_layout} }, base_url => $base_url);
+  $self->render('csv_import/report', { no_layout => $params{no_layout} || $::form->{no_layout} });
 }
 
 
@@ -403,12 +404,6 @@ sub save_report {
     push @raw_methods,  $self->raw_data_headers->{headers}->[$i];
   }
 
-  $::lxdebug->dump(0,  "methods",
-    [ \@info_methods,
-     \@methods,
-     \@raw_methods  ]
-  );
-
   $sth->execute($report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
 
   # col offsets
@@ -469,4 +464,8 @@ sub track_progress {
 }
 
 
+sub cleanup_reports {
+  SL::DB::Manager::CsvImportReport->cleanup;
+}
+
 1;