diff options
Diffstat (limited to 'wqflask/base/data_set.py')
| -rw-r--r-- | wqflask/base/data_set.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index dbdbb51c..6649f8af 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -111,7 +111,7 @@ Publish or ProbeSet. E.g. new_type = "ProbeSet" self.datasets[short_dataset_name] = new_type # Set LOG_LEVEL_DEBUG=5 to see the following: - logger.debugf(5,"datasets",self.datasets) + logger.debugf(5, "datasets",self.datasets) def __call__(self, name): return self.datasets[name] @@ -426,13 +426,15 @@ def datasets(group_name, this_group = None): FROM PublishFreeze,InbredSet WHERE PublishFreeze.InbredSetId = InbredSet.Id and InbredSet.Name = '%s' - and PublishFreeze.public > %s) + and PublishFreeze.public > %s + and PublishFreeze.confidentiality < 1) UNION (SELECT '#GenoFreeze',GenoFreeze.FullName,GenoFreeze.Name FROM GenoFreeze, InbredSet WHERE GenoFreeze.InbredSetId = InbredSet.Id and InbredSet.Name = '%s' - and GenoFreeze.public > %s) + and GenoFreeze.public > %s + and GenoFreeze.confidentiality < 1) UNION (SELECT Tissue.Name, ProbeSetFreeze.FullName,ProbeSetFreeze.Name FROM ProbeSetFreeze, ProbeFreeze, InbredSet, Tissue @@ -441,6 +443,7 @@ def datasets(group_name, this_group = None): and ProbeFreeze.InbredSetId = InbredSet.Id and InbredSet.Name like %s and ProbeSetFreeze.public > %s + and ProbeSetFreeze.confidentiality < 1 ORDER BY Tissue.Name, ProbeSetFreeze.CreateTime desc, ProbeSetFreeze.AvgId) ''' % (group_name, webqtlConfig.PUBLICTHRESH, group_name, webqtlConfig.PUBLICTHRESH, |