summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-05-05 13:03:09 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-05-05 13:05:06 +0200
commit3c34bd06079b29d7af91ec15ad912e1faf60ecbb (patch)
tree333db30d0b6bbb112d77c32ca1b878c8f70ee69a /ishtar_common/data_importer.py
parentbdc9cdab0d5e314b5d1a33a2d87fca22138d649d (diff)
downloadIshtar-3c34bd06079b29d7af91ec15ad912e1faf60ecbb.tar.bz2
Ishtar-3c34bd06079b29d7af91ec15ad912e1faf60ecbb.zip
Imports: manage importation interface, error file
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index cef98789e..24c8e166d 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -277,7 +277,7 @@ class StrChoiceFormater(Formater):
if output == 'db' and self.db_target:
from ishtar_common.models import TargetKey
for missing in self.missings:
- q = {'target':self.db_target, 'value':missing}
+ q = {'target':self.db_target, 'key':missing}
if TargetKey.objects.filter(**q).count():
continue
with transaction.commit_on_success():
@@ -409,7 +409,7 @@ class StrToBoolean(Formater):
from ishtar_common.models import TargetKey
for missing in self.missings:
try:
- q = {'target':self.db_target, 'value':missing}
+ q = {'target':self.db_target, 'key':missing}
models.TargetKey.objects.create(**q)
except IntegrityError:
pass
@@ -853,7 +853,8 @@ class Importer(object):
def get_csv_errors(self):
if not self.errors:
return ""
- csv_errors = ["line,col,error"]
+ csv_errors = ['"%s","%s","%s"' % (unicode(_("line")),
+ unicode(_("col")), unicode(_("error")))]
for line, col, error in self.errors:
csv_errors.append(u'"%s","%s","%s"' % (line and unicode(line) or '-',
col and unicode(col) or '-',