From f2048ed7d3b7143869cebe228dec93b2f6fd3843 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Fri, 9 Sep 2022 21:33:23 +0000
Subject: Fix bug in retrieve_other_names

After a recent change, it always tries to unpack 6 values from the
query, but it should only be unpacking 4 values if not type ProbeSet (so
it was throwing an error for anything not ProbeSet)
---
 wqflask/base/data_set.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 67515111..dda5e8f9 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -652,6 +652,8 @@ class DataSet:
                         "ProbeSetFreeze.FullName = %s "
                         "OR ProbeSetFreeze.ShortName = %s)",
                         (self.name,)*3)
+                    (self.id, self.name, self.fullname, self.shortname,
+                    self.data_scale, self.tissue) = cursor.fetchone()
                 else:
                     self.tissue = "N/A"
                     cursor.execute(
@@ -660,8 +662,8 @@ class DataSet:
                         "WHERE (Name = %s OR FullName = "
                         "%s OR ShortName = %s)",
                         (self.name,)*3)
-                (self.id, self.name, self.fullname, self.shortname,
-                 self.data_scale, self.tissue) = cursor.fetchone()
+                    (self.id, self.name, self.fullname,
+                    self.shortname) = cursor.fetchone()
             except TypeError:
                 pass
 
-- 
cgit v1.2.3