From 4acfeafd96abcc532fdbd7eea6bf8229ad9727ae Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 30 Jun 2009 10:14:45 +0000
Subject: [PATCH] start to use featureloc.is_fmin_partial and
featureloc.is_fmax_partial
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@11235 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
artemis_sqlmap/Feature.xml | 6 +++++-
artemis_sqlmap/FeatureLoc.xml | 16 ++++++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/artemis_sqlmap/Feature.xml b/artemis_sqlmap/Feature.xml
index 857913156..7fc60680e 100644
--- a/artemis_sqlmap/Feature.xml
+++ b/artemis_sqlmap/Feature.xml
@@ -68,6 +68,8 @@
<result property="featureLoc.fmin" column="fmin" nullValue="-1"/>
<result property="featureLoc.fmax" column="fmax" nullValue="0"/>
<result property="featureLoc.phase" column="phase"/>
+ <result property="featureLoc.fminPartial" column="is_fmin_partial"/>
+ <result property="featureLoc.fmaxPartial" column="is_fmax_partial"/>
<result property="cvTerm.cvTermId" column="type_id"/>
<result property="featureSynonyms" column="{feature.uniqueName=uniqueName}"
@@ -205,7 +207,9 @@
fp.type_id AS prop_type_id,
fp.rank AS prop_rank,
fp.value,
- fl.phase
+ fl.phase,
+ fl.is_fmin_partial,
+ fl.is_fmax_partial
FROM feature f
LEFT JOIN featureloc fl ON ( f.feature_id = fl.feature_id )
LEFT JOIN feature_relationship fr ON fr.subject_id = f.feature_id
diff --git a/artemis_sqlmap/FeatureLoc.xml b/artemis_sqlmap/FeatureLoc.xml
index 7312d277b..c9b4daa11 100644
--- a/artemis_sqlmap/FeatureLoc.xml
+++ b/artemis_sqlmap/FeatureLoc.xml
@@ -22,21 +22,23 @@
<result property="fmax" column="fmax" nullValue="-999" />
<result property="strand" column="strand" nullValue="0" />
<result property="phase" column="phase" />
- <result property="residueInfo" column="residue_info"/>
- <result property="locGroup" column="locgroup"/>
- <result property="rank" column="rank"/>
+ <result property="residueInfo" column="residue_info"/>
+ <result property="locGroup" column="locgroup"/>
+ <result property="rank" column="rank"/>
+ <result property="fminPartial" column="is_fmin_partial"/>
+ <result property="fmaxPartial" column="is_fmax_partial"/>
</resultMap>
<!-- select featureloc -->
<select id="getFeatureLoc" resultMap="map-location-lazy">
- SELECT feature_id, srcfeature_id, fmin, fmax, strand, phase, residue_info, locgroup, rank
+ SELECT feature_id, srcfeature_id, fmin, fmax, strand, phase, residue_info, locgroup, rank, is_fmin_partial, is_fmax_partial
FROM featureloc
WHERE featureloc.feature_id=#id#
</select>
<select id="getFeatureLocsByListOfIds" resultMap ="map-location-lazy">
- SELECT feature_id, srcfeature_id, fmin, fmax, strand, phase, residue_info, locgroup, rank
+ SELECT feature_id, srcfeature_id, fmin, fmax, strand, phase, residue_info, locgroup, rank, is_fmin_partial, is_fmax_partial
FROM featureloc
WHERE featureloc.feature_id IN <iterate open="(" close=")" conjunction=","> $[]$ </iterate>
</select>
@@ -54,7 +56,9 @@
<update id="updateFeatureLoc"
parameterClass="FeatureLoc">
UPDATE featureloc
- SET fmin=$fmin$, fmax=$fmax$, rank=$rank$, strand=$strand$
+ SET fmin=$fmin$, fmax=$fmax$, rank=$rank$, strand=$strand$,
+ is_fmin_partial=#fminPartial#,
+ is_fmax_partial=#fmaxPartial#
<isNotNull property="phase">
, phase=$phase$
</isNotNull>
--
GitLab