From f0db06c519f7679bd5ea8bc80e6b999935ecde2b Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 15 Apr 2010 09:00:41 +0000
Subject: [PATCH] check is_analysis and cvterm
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13689 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
artemis_sqlmap/Feature.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/artemis_sqlmap/Feature.xml b/artemis_sqlmap/Feature.xml
index 5643d036f..18284464b 100644
--- a/artemis_sqlmap/Feature.xml
+++ b/artemis_sqlmap/Feature.xml
@@ -220,9 +220,9 @@
<dynamic>
<isGreaterThan property="featureLoc.featureBySrcFeatureId.featureId" compareValue="0">
srcfeature_id=$featureLoc.featureBySrcFeatureId.featureId$
- <isNotNull property="analysis">
- AND is_analysis=#analysis#
- </isNotNull>
+ <isGreaterThan property="cvTerm.cvTermId" compareValue="0" prepend="AND">
+ ( is_analysis=#analysis# OR f.type_id!=$cvTerm.cvTermId$ )
+ </isGreaterThan>
</isGreaterThan>
<isGreaterEqual property="featureLoc.fmin" compareValue="0" prepend="AND">
<![CDATA[ fl.fmin >= $featureLoc.fmin$ AND fl.fmax < $featureLoc.fmax$ ]]>
--
GitLab