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,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