From fdaa21b474e1aec01efa49c1f7f42f5a8b5f16c5 Mon Sep 17 00:00:00 2001 From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04> Date: Fri, 3 Apr 2009 15:08:49 +0000 Subject: [PATCH] changes for updating feature residues in the database git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@10380 ee4ac58c-ac51-4696-9907-e4b3aa274f04 --- artemis_sqlmap/Feature.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/artemis_sqlmap/Feature.xml b/artemis_sqlmap/Feature.xml index e30fdf104..0a4cfca7f 100644 --- a/artemis_sqlmap/Feature.xml +++ b/artemis_sqlmap/Feature.xml @@ -485,7 +485,11 @@ </dynamic> substring(residues from $endBase$ for $basesToEnd$), seqlen=$seqLen$ - WHERE feature_id=$featureId$ + WHERE + <isNotEqual property="featureId" compareValue="-1">feature_id=$featureId$</isNotEqual> + <isEqual property="featureId" compareValue="-1"> + feature_id=(SELECT feature_id FROM feature WHERE uniquename=#uniqueName#) + </isEqual> </update> <!-- INSERT --> @@ -494,6 +498,7 @@ INSERT INTO feature ( feature_id, organism_id, name, uniquename, type_id <isGreaterThan property="seqLen" compareValue="0"> , seqlen </isGreaterThan> + <isNotNull property="residues"> , residues </isNotNull> <isNotNull property="dbXRef.dbXRefId"> , dbxref_id </isNotNull> ) VALUES ( nextval('feature_feature_id_seq'), @@ -502,6 +507,7 @@ #uniqueName#, $cvTerm.cvTermId$ <isGreaterThan property="seqLen" compareValue="0"> , $seqLen$ </isGreaterThan> + <isNotNull property="residues"> , #residues# </isNotNull> <isNotNull property="dbXRef.dbXRefId"> , $dbXRef.dbXRefId$ </isNotNull> ) </insert> -- GitLab