From 63f3d077570d2f0748658fd226d763c28f036680 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Mon, 3 Sep 2007 12:35:22 +0000
Subject: [PATCH] fix getGeneFeature() or single schema
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@6340 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../sanger/artemis/util/DatabaseDocument.java | 20 +++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/uk/ac/sanger/artemis/util/DatabaseDocument.java b/uk/ac/sanger/artemis/util/DatabaseDocument.java
index a5a98d41d..7c6f81776 100644
--- a/uk/ac/sanger/artemis/util/DatabaseDocument.java
+++ b/uk/ac/sanger/artemis/util/DatabaseDocument.java
@@ -456,7 +456,7 @@ public class DatabaseDocument extends Document
if(dao instanceof IBatisDAO)
((IBatisDAO) dao).startTransaction();
- logger4j.debug("RETRIEVE SOURCE FEATURE");
+ logger4j.debug("RETRIEVE SOURCE FEATURE FROM: "+getLocation());
Feature srcFeature = getChadoSequence(dao, sequenceBuffer);
gff_buffer = getGff(dao, srcFeature);
@@ -876,7 +876,23 @@ public class DatabaseDocument extends Document
Hashtable id_store = new Hashtable();
- reset((String)getLocation(), (String)schema_search.get(0));
+ boolean singleSchema = true;
+ final List pg_schemas = dao.getSchema();
+ Iterator schemasIt = pg_schemas.iterator();
+ while(schemasIt.hasNext())
+ {
+ String thisSchema = (String)schemasIt.next();
+
+ if( thisSchema.equalsIgnoreCase(schema) )
+ {
+ singleSchema = false;
+ break;
+ }
+ }
+ if(singleSchema)
+ logger4j.debug("SINGLE SCHEMA");
+ else
+ reset((String)getLocation(), (String)schema_search.get(0));
dao = getDAO();
Feature chadoFeature =
(Feature)(dao.getFeaturesByUniqueName(search_gene).get(0));
--
GitLab