diff options
| author | zsloan | 2016-11-02 20:04:09 +0000 |
|---|---|---|
| committer | zsloan | 2016-11-02 20:04:09 +0000 |
| commit | daecb401ec470064cb69c11e0241fd14a915de8f (patch) | |
| tree | bfc9416af4d1b35313b2eb2a8ec772c98620b91a /wqflask/base | |
| parent | 717677b0c09f6ba08268db12d4889503cc2606d9 (diff) | |
| parent | 9b27928ff72f48fc2b9144b6aa1e12cf97afadd3 (diff) | |
| download | genenetwork2-daecb401ec470064cb69c11e0241fd14a915de8f.tar.gz | |
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into development
Diffstat (limited to 'wqflask/base')
| -rw-r--r-- | wqflask/base/data_set.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 04436a2e..06e02b02 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -279,6 +279,7 @@ class DatasetGroup(object): self.incparentsf1 = False self.allsamples = None self._datasets = None + self.genofile = None def get_accession_id(self): results = g.db.execute("""select InfoFiles.GN_AccesionId from InfoFiles, PublishFreeze, InbredSet where @@ -423,7 +424,10 @@ class DatasetGroup(object): genotype_1 = reaper.Dataset() # reaper barfs on unicode filenames, so here we ensure it's a string - full_filename = str(locate(self.name+'.geno','genotype')) + if self.genofile: + full_filename = str(locate(self.genofile, 'genotype')) + else: + full_filename = str(locate(self.name + '.geno', 'genotype')) genotype_1.read(full_filename) if genotype_1.type == "group" and self.parlist: |