diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-26 19:50:43 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-26 19:50:43 +0100 |
| commit | 43b0c50accfa1017ee323ba121ac53920d1cdbf5 (patch) | |
| tree | 9f554b2e55dfa8a36209363c82ddaa4915c3448f /chimere/tasks.py | |
| parent | f769930eca0a0bbccf991e52c6c6abbba6414390 (diff) | |
| parent | a95b7d7e58b6d8e0847b9a49e3afe0ac7a939a39 (diff) | |
| download | Chimère-43b0c50accfa1017ee323ba121ac53920d1cdbf5.tar.bz2 Chimère-43b0c50accfa1017ee323ba121ac53920d1cdbf5.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/templates/chimere/blocks/alternate_multimedia.html
chimere/templates/chimere/blocks/categories.html
chimere/widgets.py
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: |