From 43e7bfdf37c7575c21827c31897d1b7ebda45d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr>
Date: Wed, 5 Jun 2019 09:42:29 +0200
Subject: [PATCH] optimize compounds query with a tweak to the range filters
---
ippisite/ippidb/views/compound_query.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ippisite/ippidb/views/compound_query.py b/ippisite/ippidb/views/compound_query.py
index b5a6797b..fc22960e 100644
--- a/ippisite/ippidb/views/compound_query.py
+++ b/ippisite/ippidb/views/compound_query.py
@@ -195,9 +195,9 @@ class CompoundSimilarityFilterHandler(FilterHandler):
# FIXME: test if exists before running
create_tanimoto(query, fingerprint)
queryset = queryset.filter(compoundtanimoto__canonical_smiles=query, compoundtanimoto__fingerprint=fingerprint).annotate(tanimoto=F('compoundtanimoto__tanimoto'))
- else:
- self.filter_context[self.parameter_name+'_fingerprint'] = 'ECFP4'
- self.filter_context[self.parameter_name+'_query'] = ''
+ #else:
+ # self.filter_context[self.parameter_name+'_fingerprint'] = 'ECFP4'
+ # self.filter_context[self.parameter_name+'_query'] = ''
return queryset
def post_process(self, compound_ids, queryset):
@@ -493,7 +493,7 @@ class CompoundListView(ListView):
for cfh in cfhs:
qs = cfh.process(qs)
# post filter filters
- if self.filter_context:
+ if {k:v for k,v in self.filter_context.items() if k!='disabled'}:
# compound ids in the final selection if a selection has happened
cids = [c for c in qs.all().values_list('id', flat=True)]
else:
--
GitLab