From 314aaa810c436c342398ef8e8b66c89aa2ff03d0 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 25 Feb 2010 14:16:20 +0000
Subject: [PATCH] use history qualifiers rather than private qualifiers and
store them as feature_cvterms
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13338 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../artemis/chado/ChadoTransactionManager.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
index d68ec7637..752797341 100644
--- a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
+++ b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
@@ -137,8 +137,8 @@ public class ChadoTransactionManager
public static String PRODUCT_DB = "PRODUCT";
public static String PRODUCT_CV =
Options.getOptions().getProperty("product_cvname");
- public static String PRIVATE_CV =
- Options.getOptions().getProperty("private_cvname");
+ public static String HISTORY_CV =
+ Options.getOptions().getProperty("history_cvname");
// number of SQL commands successfully processed during a commit
public static int commitReturnValue = 0;
@@ -159,7 +159,7 @@ public class ChadoTransactionManager
{
logger4j.debug("PRODUCT STORED AS A CV (product_cv=yes) IN "+PRODUCT_CV);
int nsize = 4;
- if(PRIVATE_CV != null)
+ if(HISTORY_CV != null)
nsize++;
CV_NAME = new String[]
@@ -172,7 +172,7 @@ public class ChadoTransactionManager
{
logger4j.debug("PRODUCT STORED AS A FEATUREPROP (product_cv=no)");
int nsize = 3;
- if(PRIVATE_CV != null)
+ if(HISTORY_CV != null)
nsize++;
CV_NAME = new String[]
@@ -180,8 +180,8 @@ public class ChadoTransactionManager
"controlled_curation",
"class" };
}
- if(PRIVATE_CV != null)
- CV_NAME[CV_NAME.length-1] = "private";
+ if(HISTORY_CV != null)
+ CV_NAME[CV_NAME.length-1] = "history";
logger4j.debug("SYNONYM NAMES ARE STORED IN "+SYNONYM_TAG_CVNAME);
}
@@ -2316,8 +2316,8 @@ public class ChadoTransactionManager
cvName = "CC_";
else if(qualifier_name.equals("product"))
cvName = PRODUCT_CV;
- else if(qualifier_name.equals("private"))
- cvName = PRIVATE_CV;
+ else if(qualifier_name.equals("history"))
+ cvName = HISTORY_CV;
for(int i=0; i<strings.size(); i++)
{
--
GitLab