From 20c8d5917f5b69c349dcac9aa78af1b5252345f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=BCller?= <j.mueller@vr.rwth-aachen.de>
Date: Tue, 10 Mar 2020 14:00:22 +0100
Subject: [PATCH] Update nest_get_neuron_properies
---
access_node/controllers/nest_controller.py | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/access_node/controllers/nest_controller.py b/access_node/controllers/nest_controller.py
index 6b8f1b8..a9c155a 100644
--- a/access_node/controllers/nest_controller.py
+++ b/access_node/controllers/nest_controller.py
@@ -68,7 +68,7 @@ def nest_get_multimeter_info(): # noqa: E501
con = connect_to_database()
cur = con.cursor()
- ur.execute("SELECT * FROM MULTIMETERS;")
+ cur.execute("SELECT * FROM MULTIMETERS;")
attributes = np.array(cur.fetchall())
@@ -185,19 +185,18 @@ def nest_get_neuron_properties(gids=None): # noqa: E501
else:
cur.execute("Select * FROM GIDS WHERE GID IN %s", (tuple(gids),))
- con.close()
-
- properties = np.array(cur.fetchall())
- properties = np.delete(properties, [1,2], 1)
-
nest_properties = []
- for k in range(len(properties[:,0])):
- props = {}
- id = properties[k,0]
- for i in range(1, len(colnames)):
- props.update({colnames[i]: properties[k,i]})
- nest_properties.extend(NestNeuronProperties(id, props))
+ properties = np.array(cur.fetchall())
+ if properties.size != 0:
+ properties = np.delete(properties, [1,2], 1)
+ for k in range(len(properties[:,0])):
+ props = {}
+ id = properties[k,0]
+ for i in range(1, len(colnames)):
+ props.update({colnames[i]: properties[k,i] if properties[k,i] != None else []})
+ nest_properties.append(NestNeuronProperties(id, props))
+ con.close()
return nest_properties
--
GitLab