Fixed collections so they can be very large (1000+ traits)

Added option to submit traits in collection to BNW

Fixed issue with "x" values for user-submitted traits

Fixed issue where post-publications descriptions were wrongly appearing in global search results

1 files changed, 2 insertions, 9 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 4a422ee4..55782576 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -371,23 +371,16 @@ class DatasetGroup(object):
             result = Redis.get(key)
 
         if result is not None:
-            #logger.debug("Sample List Cache hit!!!")
-            #logger.debug("Before unjsonifying {}: {}".format(type(result), result))
             self.samplelist = json.loads(result)
-            #logger.debug("  type: ", type(self.samplelist))
-            #logger.debug("  self.samplelist: ", self.samplelist)
         else:
             logger.debug("Cache not hit")
 
             genotype_fn = locate_ignore_error(self.name+".geno",'genotype')
-            mapping_fn = locate_ignore_error(self.name+".fam",'mapping')
-            if mapping_fn:
-                self.samplelist = get_group_samplelists.get_samplelist("plink", mapping_fn)
-            elif genotype_fn:
+            if genotype_fn:
                 self.samplelist = get_group_samplelists.get_samplelist("geno", genotype_fn)
             else:
                 self.samplelist = None
-            logger.debug("Sample list: ",self.samplelist)
+
             if USE_REDIS:
                 Redis.set(key, json.dumps(self.samplelist))
                 Redis.expire(key, 60*5)