add OrganismProp

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

artemis_sqlmap/Organism.xml

@@ -10,7 +10,17 @@
       <flushInterval hours="24"/>  
       <property name="cache-size" value="100" /> 
     </cacheModel> 
-
+    
+    <resultMap id="map-organism" class="org.gmod.schema.organism.Organism">
+       <result property="organismId" column="organismId"/>
+       <result property="abbreviation" column="abbreviation"/>
+       <result property="commonName" column="commonName"/>
+       <result property="genus" column="genus"/>
+       <result property="species" column="species"/>
+       <result property="comment" column="comment"/>
+       <result property="organismProps" column="organismId" select="getOrganismPropByOrganismIdLazy"/>
+    </resultMap>
+    
     <select id="getOrganism"
      resultClass="org.gmod.schema.organism.Organism"> 
       SELECT organism_id AS organismId, abbreviation, genus, species, common_name AS commonName, comment 
@@ -60,7 +70,7 @@
 		</isNull>
     </select>
 	
-	<select id="getOrganismsContainingSrcFeatures" resultClass="org.gmod.schema.organism.Organism">
+	<select id="getOrganismsContainingSrcFeatures" resultMap="map-organism">
 	  SELECT DISTINCT ON( feature.organism_id )  
 		organism.organism_id AS organismId, abbreviation, genus, species, common_name AS commonName, comment
 		FROM feature 
@@ -70,7 +80,7 @@
 		AND ( <include refid="source_feature_cvterm_names"/> ) 
 	</select>
 	
-	<select id="getTopLevelOrganisms" resultClass="org.gmod.schema.organism.Organism">
+	<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 

artemis_sqlmap/OrganismProp.xml

+<?xml version="1.0" encoding="UTF-8" ?> 
+ 
+<!DOCTYPE sqlMap 
+    PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" 
+    "http://ibatis.apache.org/dtd/sql-map-2.dtd"> 
+ 
+<sqlMap namespace="OrganismProp">    
+      <resultMap id="map-organismprop-with-cvterm-lazy" 
+                class="org.gmod.schema.organism.OrganismProp">
+        <result property="value" column="value" />
+        <result property="rank" column="rank" />
+        <result property="cvTerm" column="type_id" select="getCvtermByCvTermId" />
+     </resultMap>
+     
+     <select id="getOrganismPropByOrganismIdLazy" resultMap="map-organismprop-with-cvterm-lazy">
+       SELECT type_id, value, rank 
+       FROM organismprop
+       WHERE organism_id=#organism_id#
+     </select>    
+</sqlMap> 

artemis_sqlmap/chado_iBatis_config.xml

@@ -82,6 +82,7 @@
   <sqlMap resource="artemis_sqlmap/Pub.xml" />
   <sqlMap resource="artemis_sqlmap/Feature.xml" />
   <sqlMap resource="artemis_sqlmap/Organism.xml" />
+  <sqlMap resource="artemis_sqlmap/OrganismProp.xml" />
   <sqlMap resource="artemis_sqlmap/FeatureCvTerm.xml" />
   <sqlMap resource="artemis_sqlmap/FeatureCvTermDbXRef.xml" />
   <sqlMap resource="artemis_sqlmap/FeatureCvTermProp.xml" />