From 56515265f2630db4236e3fe0b73880c7bdd4f8ea Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Mon, 8 Oct 2007 14:07:06 +0000
Subject: [PATCH] fixes getOrganism
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@6512 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
artemis_sqlmap/Organism.xml | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/artemis_sqlmap/Organism.xml b/artemis_sqlmap/Organism.xml
index 8088f5385..fd6bcb27d 100644
--- a/artemis_sqlmap/Organism.xml
+++ b/artemis_sqlmap/Organism.xml
@@ -19,12 +19,23 @@
<isNotNull property="organismId">
<isGreaterThan property="organismId" compareValue="0">
WHERE organism_id=#organismId#
+ <isNotNull prepend="AND" property="commonName">
+ common_name=#commonName#
+ </isNotNull>
</isGreaterThan>
+
+ <isLessEqual property="organismId" compareValue="0">
+ <isNotNull prepend="WHERE" property="commonName">
+ common_name=#commonName#
+ </isNotNull>
+ </isLessEqual>
</isNotNull>
-
- <isNotNull prepend="WHERE" property="commonName">
- common_name=#commonName#
- </isNotNull>
+
+ <isNull property="organismId">
+ <isNotNull prepend="WHERE" property="commonName">
+ common_name=#commonName#
+ </isNotNull>
+ </isNull>
<isNull prepend="ORDER BY" property="organismId">
commonName
--
GitLab