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

@@ -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$ ]]>