diff --git a/apps/cgs/urls.py b/apps/cgs/urls.py index 7d85fd8..d92bfac 100644 --- a/apps/cgs/urls.py +++ b/apps/cgs/urls.py @@ -10,7 +10,7 @@ urlpatterns = ( #url(r'^(?P-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_cgs_conf'), #url(r'^(?P-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_cgs_conf'), url(r'^(?P-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_cgs_conf'), - #url(r'^(?P-?\d+)/export/$', 'apps.cgs.views.cgs_conf_export', name='url_export_cgs_conf'), - url(r'^(?P-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'), + url(r'^(?P-?\d+)/export/$', 'apps.cgs.views.cgs_conf_export', name='url_export_cgs_conf'), + #url(r'^(?P-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'), ) diff --git a/apps/cgs/views.py b/apps/cgs/views.py index 65934d0..2b65792 100644 --- a/apps/cgs/views.py +++ b/apps/cgs/views.py @@ -125,29 +125,32 @@ def cgs_conf_write(request, id_conf): f2 = int(conf.freq2) f3 = int(conf.freq3) - - post_data = {"f0":f0, "f1":f1, "f2":f2, "f3":f3} - route = "http://" + str(ip) + ":" + str(port) + "/frequencies/" - r = requests.post(route, post_data) - text = r.text - text = text.split(',') - - try: - if len(text)>1: - title = text[0] - status = text[1] - status_ok = r.status_code - if title == "okay": - messages.success(request, status) + try: + post_data = {"f0":f0, "f1":f1, "f2":f2, "f3":f3} + route = "http://" + str(ip) + ":" + str(port) + "/frequencies/" + r = requests.post(route, post_data) + text = r.text + text = text.split(',') + + try: + if len(text)>1: + title = text[0] + status = text[1] + status_ok = r.status_code + if title == "okay": + messages.success(request, status) + else: + messages.error(request, status) + else: - messages.error(request, status) - - else: - title = text[0] - messages.error(request, title) + title = text[0] + messages.error(request, title) + + except: + messages.error(request, "An hardware error was found.") except: - messages.error(request, "An hardware error was found") + messages.error(request, "Could not write parameters.")