tidy

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

artemis_sqlmap/FeatureCvTermDbXRef.xml

@@ -8,10 +8,7 @@
      <typeAlias alias="FeatureCvTermDbXRef"
         type="org.gmod.schema.sequence.FeatureCvTermDbXRef"/>
         
-     <typeAlias alias="FeatureCvTerm"
-        type="org.gmod.schema.sequence.FeatureCvTerm"/>
-        
-     <resultMap id="select-featurecvtermdbxref" class="FeatureCvTermDbXRef"
+     <resultMap id="map-featurecvtermdbxref" class="FeatureCvTermDbXRef"
                 groupBy="featureCvTermId">
         <result property="featureCvTerm.featureCvTermId"   column="feature_cvterm_id" />
         <result property="dbXRef.accession"   column="accession"/>
@@ -21,7 +18,7 @@
     </resultMap>
    
     <select id="getFeatureCvTermDbXRefByFeature" parameterClass="Feature"
-             resultMap="select-featurecvtermdbxref">
+             resultMap="map-featurecvtermdbxref">
        SELECT fcd.feature_cvterm_id, dbx.*, db.name 
        FROM feature_cvterm_dbxref fcd 
        LEFT JOIN dbxref dbx ON dbx.dbxref_id=fcd.dbxref_id 
@@ -36,7 +33,7 @@
     </select>
 	
 	<select id="getFeatureCvTermDbXRefBySrcFeatureId" parameterClass="java.lang.Integer"
-             resultMap="select-featurecvtermdbxref">
+             resultMap="map-featurecvtermdbxref">
        SELECT fcd.feature_cvterm_id, dbx.*, db.name 
        FROM feature_cvterm_dbxref fcd 
        LEFT JOIN dbxref dbx ON dbx.dbxref_id=fcd.dbxref_id 
@@ -46,7 +43,7 @@
     </select>
      
     <select id="getFeatureCvTermDbXRefByFeatureCvTerm" parameterClass="java.lang.Integer"
-             resultMap="select-featurecvtermdbxref">
+             resultMap="map-featurecvtermdbxref">
        SELECT fcd.feature_cvterm_id, dbx.*, db.name 
        FROM feature_cvterm_dbxref fcd 
        LEFT JOIN dbxref dbx ON dbx.dbxref_id=fcd.dbxref_id 

artemis_sqlmap/FeaturePub.xml

@@ -10,11 +10,8 @@
      <typeAlias alias="FeaturePub"
         type="org.gmod.schema.sequence.FeaturePub"/>
      
-     <typeAlias alias="Feature"
-        type="org.gmod.schema.sequence.Feature"/>
      
-     
-     <resultMap id="getfeaturePubs" 
+     <resultMap id="map-featurepubs" 
                 class="FeaturePub" >
        <result property="feature.featureId" column="id"/>        
        <result property="pub.pubId"       column="pub_id"/>
@@ -34,7 +31,7 @@
      </resultMap>
     
      <select id="getFeaturePubsBySrcFeatureId" parameterClass="java.lang.Integer" 
-             resultMap="getfeaturePubs">
+             resultMap="map-featurepubs">
         SELECT
           f.feature_id AS id, pub.*
         FROM feature f