change sql select statement to get same rank properties

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@3333 ee4ac58c-ac51-4696-9907-e4b3aa274f04

act

@@ -7,7 +7,7 @@
 # /usr/local/bin/ or elsewhere.
 
 
-# $Header: //tmp/pathsoft/artemis/act,v 1.4 2005-06-06 18:34:40 tjc Exp $
+# $Header: //tmp/pathsoft/artemis/act,v 1.5 2005-08-05 15:47:32 tjc Exp $
 
 # resolve links - $0 may be a link
 PRG=$0
@@ -35,7 +35,7 @@ export CLASSPATH
 
 ACT_PROPERTIES="-Dartemis.environment=UNIX"
 
-MEM="-mx150m -ms20m"
+MEM="-mx500m -ms20m"
 
 if [ "$JVM_FLAGS" = "" ]
 then

uk/ac/sanger/artemis/util/DatabaseDocument.java

@@ -265,6 +265,7 @@ public class DatabaseDocument extends Document
        " LEFT JOIN feature_relationship ON feature_relationship.subject_id=feature.feature_id"+
        " LEFT JOIN featureprop ON featureprop.feature_id=feature.feature_id"+
        " WHERE srcfeature_id = "+parentFeatureID+" and  featureloc.feature_id=feature.feature_id"+
+       " and (featureloc.rank=feature_relationship.rank OR feature_relationship.rank IS NULL)"+
        " ORDER BY feature.type_id,  uniquename";
 
 //     "SELECT timelastmodified, feature.feature_id, object_id, strand, fmin, fmax, uniquename, feature.type_id, "+