diff --git a/artemis_sqlmap/Organism.xml b/artemis_sqlmap/Organism.xml index 8b03b450ab27745fdd532803f15ff82a91c0c34a..96f6080510a9be2e94d246832e14f70e118d6b33 100644 --- a/artemis_sqlmap/Organism.xml +++ b/artemis_sqlmap/Organism.xml @@ -81,13 +81,15 @@ </select> <select id="getTopLevelOrganisms" resultMap="map-organism"> - SELECT DISTINCT ON( feature.organism_id ) - organism.organism_id AS organismId, abbreviation, genus, species, common_name AS commonName, comment - FROM feature - join organism using (organism_id) - JOIN featureprop using (feature_id) - WHERE featureprop.type_id in - (SELECT cvterm_id FROM cvterm JOIN cv using (cv_id) WHERE cv.name = 'genedb_misc' AND cvterm.name = 'top_level_seq' ) + SELECT organism.organism_id AS organismId, abbreviation, genus, species, common_name AS commonName, comment + FROM organism + WHERE exists ( + SELECT * + FROM organismprop + JOIN cvterm on organismprop.type_id = cvterm.cvterm_id + JOIN cv using (cv_id) + WHERE organism_id = organism.organism_id + AND cv.name = 'genedb_misc' and cvterm.name = 'populated' ) </select> </sqlMap> diff --git a/uk/ac/sanger/artemis/chado/IBatisDAO.java b/uk/ac/sanger/artemis/chado/IBatisDAO.java index 2da3faa4242fe6ca9538d9ecd0893044c307edc9..2e9f1c99d4963e46df109b19028acdca075abefd 100644 --- a/uk/ac/sanger/artemis/chado/IBatisDAO.java +++ b/uk/ac/sanger/artemis/chado/IBatisDAO.java @@ -593,7 +593,7 @@ public class IBatisDAO extends GmodDAO public List getOrganismsContainingSrcFeatures() { - CvTerm cvTerm = getCvTermByNameAndCvName("top_level_seq", "genedb_misc"); + CvTerm cvTerm = getCvTermByNameAndCvName("populated", "genedb_misc"); if(cvTerm != null) return sqlMap.queryForList("getTopLevelOrganisms", null); else