diff --git a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java index 444080cdba525688245711c67a5080b79db333e8..8e00d327128cbc1ff1bdb3bc4b3b0cbfd74ac425 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 {