diff options
Diffstat (limited to 'chimere/tasks.py')
| -rw-r--r-- | chimere/tasks.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chimere/tasks.py b/chimere/tasks.py index 43b219d..02e32a4 100644 --- a/chimere/tasks.py +++ b/chimere/tasks.py @@ -87,20 +87,18 @@ def importing(importer_pk): importer.state = unicode(IMPORT_MESSAGES['import_process'][0]) importer.save() new_item, updated_item, error = importer.manager.get() - if error: - importer.state = unicode(IMPORT_MESSAGES['import_failed'][0]) \ - + u" - " + unicode(IMPORT_MESSAGES['import_failed'][1]) % error - importer.save() - return - importer.state = unicode(IMPORT_MESSAGES['import_done'][0]) + u" - " \ + importer.state = error + ' ' if error else '' + importer.state += unicode(IMPORT_MESSAGES['import_done'][0]) + importer.state += u" - " \ + unicode(IMPORT_MESSAGES['import_done'][1]) % {'new':new_item, 'updated':updated_item} + importer.state = importer.state[:200] importer.save() return True @task() @single_instance_task(60*10) -def exporting(importer_pk): +def exporting(importer_pk, extra_args=[]): try: importer = Importer.objects.get(pk=importer_pk) except ObjectDoesNotExist: @@ -113,7 +111,7 @@ def exporting(importer_pk): importer.save() error = None try: - updated_item, error = importer.manager.put() + updated_item, error = importer.manager.put(extra_args) except OsmApi.ApiError, error: pass if error: |