From f4fbb6d53419a19c6ee67977d18605cdcbb09c0e Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 12 Aug 2021 22:35:53 +0000
Subject: add function for reading in JSON file that lists sample lists unique
 to each study within a group (in this case only BXD Longevity for now)

---
 wqflask/base/data_set.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'wqflask/base/data_set.py')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 4cb82665..b8f2f9fb 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -398,6 +398,15 @@ class DatasetGroup:
         if maternal and paternal:
             self.parlist = [maternal, paternal]
 
+    def get_study_samplelists(self):
+        study_sample_file = "%s/study_sample_lists/%s.json" % (webqtlConfig.GENODIR, self.name)
+        try:
+            f = open(study_sample_file)
+        except:
+            return None
+        study_samples = json.load(f)
+        return study_samples
+
     def get_genofiles(self):
         jsonfile = "%s/%s.json" % (webqtlConfig.GENODIR, self.name)
         try:
-- 
cgit v1.2.3


From 98683bd5cc809aa03e0bd58a67733498b4f56a9d Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 12 Aug 2021 23:17:04 +0000
Subject: Fix the way the study_sample_lists path is set and checked

---
 wqflask/base/data_set.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask/base/data_set.py')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index b8f2f9fb..1042e1bd 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -399,7 +399,7 @@ class DatasetGroup:
             self.parlist = [maternal, paternal]
 
     def get_study_samplelists(self):
-        study_sample_file = "%s/study_sample_lists/%s.json" % (webqtlConfig.GENODIR, self.name)
+        study_sample_file = locate_ignore_error(self.name + ".json", 'study_sample_lists')
         try:
             f = open(study_sample_file)
         except:
-- 
cgit v1.2.3


From 810b2ace0a9cb2511cf0ef6f0c01f70a0ce11915 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 12 Aug 2021 23:19:38 +0000
Subject: Return empty list instead of None in get_study_samplelists

---
 wqflask/base/data_set.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask/base/data_set.py')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 1042e1bd..0ea61faa 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -403,7 +403,7 @@ class DatasetGroup:
         try:
             f = open(study_sample_file)
         except:
-            return None
+            return []
         study_samples = json.load(f)
         return study_samples
 
-- 
cgit v1.2.3