Imports: manage control file

1 files changed, 10 insertions, 7 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 20b85e614..c7f89299e 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1400,15 +1400,18 @@ class Import(models.Model):
         self.save()
         importer = self.get_importer_instance()
         importer.importation(self.data_table)
+        # result file
+        filename = slugify(self.importer_type.name)
+        now = datetime.datetime.now().isoformat('-').replace(':','')
+        result_file = filename + "_result_%s.csv" % now
+        result_file = os.sep.join([self.result_file.storage.location,
+                                   result_file])
+        with open(result_file, 'w') as fle:
+            fle.write(importer.get_csv_result().encode('utf-8'))
+        self.result_file = File(open(fle.name))
         if importer.errors:
             self.state = 'FE'
-            error_file = None
-
-            filename = slugify(self.importer_type.name) + ".csv"
-            now = datetime.datetime.now().isoformat('-'
-                                        ).replace(':','')
-            error_file = '.'.join(filename.split('.')[:-1]) \
-                                     + "_errors_%s.csv" % now
+            error_file = filename + "_errors_%s.csv" % now
             error_file = os.sep.join([self.error_file.storage.location,
                                       error_file])
             with open(error_file, 'w') as fle: