genedb mods

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

artemis_sqlmap/Cvterm.xml

@@ -9,14 +9,25 @@
  
     <resultMap id="select-cvterm-names-result" class="uk.ac.sanger.ibatis.Cvterm">
    	<result property="id" column="cvterm_id"/>
-  	<result property="name" column="name"/>
+  	<result property="name" column="cvterm_name"/>
+        <result property="cv_name" column="cv_name"/>
      </resultMap>
 
     <!-- look up cvterms names and id -->
      <select id="getCvterm" resultMap="select-cvterm-names-result"> 
    	SELECT  
-	  cvterm.CVTERM_ID, cvterm.NAME
-        FROM cvterm, cv WHERE cv.cv_id = cvterm.cv_id
+	  cvterm.CVTERM_ID, cvterm.NAME as cvterm_name, cv.NAME as cv_name
+        FROM cvterm, cv
+        WHERE 
+            <dynamic>
+             <isNotNull property="name">
+               cvterm.name=#name# AND
+             </isNotNull>
+             <isNotNull property="cv_name">
+               cv.name=#cv_name# AND
+             </isNotNull>
+            </dynamic>
+	    cv.cv_id = cvterm.cv_id
      </select> 
  
 </sqlMap> 

uk/ac/sanger/ibatis/Cvterm.java

@@ -30,6 +30,7 @@ public class Cvterm
 
   private long id;
   private String name;
+  private String cv_name;
 
   public long getId()
   {
@@ -50,4 +51,14 @@ public class Cvterm
   {
     this.name = name;
   }
+
+  public String getCv_name()
+  {
+    return cv_name;
+  }
+
+  public void setCv_name(String name)
+  {
+    this.cv_name = name;
+  }
 }