From b79a6f02e817d70a6e8e928d9916b82a7694a589 Mon Sep 17 00:00:00 2001
From: tcarver <tjc>
Date: Mon, 6 Jan 2014 11:21:36 +0000
Subject: [PATCH] specify CV feature_property when looking up cvterm for
feature prop
---
.../artemis/chado/ChadoTransactionManager.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
index 444080cdb..8e00d3271 100644
--- a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
+++ b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
@@ -1343,7 +1343,16 @@ public class ChadoTransactionManager
}
// get the cvterm_id for this featureprop/qualifier
- Integer lcvterm_id = DatabaseDocument.getCvtermID(name);
+ CvTerm cvterm = DatabaseDocument.getCvTermByCvAndCvTerm(name, "feature_property");
+ Integer lcvterm_id;
+ if(cvterm != null)
+ lcvterm_id = cvterm.getCvTermId();
+ else
+ lcvterm_id = DatabaseDocument.getCvtermID(name);
+
+ if(lcvterm_id == null)
+ lcvterm_id = DatabaseDocument.getCvtermID(name);
+
if(lcvterm_id == null) // chado doesn't recognise this
{
JOptionPane.showMessageDialog(null,
@@ -1406,7 +1415,11 @@ public class ChadoTransactionManager
Integer lcvterm_id = null;
if(!name.equals("timelastmodified"))
{
- lcvterm_id = DatabaseDocument.getCvtermID(name);
+ CvTerm cvterm = DatabaseDocument.getCvTermByCvAndCvTerm(name, "feature_property");
+ if(cvterm != null)
+ lcvterm_id = cvterm.getCvTermId();
+ else
+ lcvterm_id = DatabaseDocument.getCvtermID(name);
if(lcvterm_id == null) // chado doesn't recognise this
{
--
GitLab