Skip to content

Commit

Permalink
wording
Browse files Browse the repository at this point in the history
  • Loading branch information
sgrimault committed Jul 22, 2017
1 parent ce19c28 commit f569aec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions webapi/main/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(r'^soft_version/$', soft_version),
(r'^soft_download/(?P<apk_name>[A-Za-z0-9\-\.]+)/$', soft_download),
(r'^data_download/(?P<file_name>[A-Za-z0-9\-\.\_]+)/$', data_download),
(r'^data_download/(?P<organisme_name>[A-Za-z0-9\-\.\_]+)/(?P<file_name>[A-Za-z0-9\-\.\_]+)/$', data_download),
(r'^data_download/(?P<organism_name>[A-Za-z0-9\-\.\_]+)/(?P<file_name>[A-Za-z0-9\-\.\_]+)/$', data_download),
(r'^import/$', import_data),
(r'^export/sqlite/$', export_sqlite),
(r'^export/taxon/$', export_taxon),
Expand All @@ -19,4 +19,3 @@
(r'^export/unity_geojson/$', export_unity_geojson),
(r'^export/unity_polygons/$', export_unity_polygons),
)

8 changes: 4 additions & 4 deletions webapi/main/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def import_data_fmi(json_data, data):
table_sheet = settings.TABLE_INV_SHEET
table_statement = settings.TABLE_INV_STATEMENT
database_id = settings.DB_INV

local_srid = settings.LOCAL_SRID

d = EasyDict(json_data)
Expand Down Expand Up @@ -972,7 +972,7 @@ def soft_download(request, apk_name):


@csrf_exempt
def data_download(request, file_name, organisme_name=None,):
def data_download(request, file_name, organism_name=None,):
"""
Return the required file
"""
Expand All @@ -981,8 +981,8 @@ def data_download(request, file_name, organisme_name=None,):
if not res:
return response

if organisme_name:
file_path = "%s%s/%s" % (settings.MOBILE_FILE_PATH, organisme_name, file_name)
if organism_name:
file_path = "%s%s/%s" % (settings.MOBILE_FILE_PATH, organism_name, file_name)
else:
file_path = "%s%s" % (settings.MOBILE_FILE_PATH, file_name)

Expand Down

0 comments on commit f569aec

Please sign in to comment.