From e9a591870451c68adf9359edb01dbcdcbeab9d8f Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 15 Aug 2006 10:26:15 +0000
Subject: [PATCH] tidy
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@4640 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/util/DatabaseDocument.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/util/DatabaseDocument.java b/uk/ac/sanger/artemis/util/DatabaseDocument.java
index be9d3f819..ef08201b4 100644
--- a/uk/ac/sanger/artemis/util/DatabaseDocument.java
+++ b/uk/ac/sanger/artemis/util/DatabaseDocument.java
@@ -102,6 +102,9 @@ public class DatabaseDocument extends Document
super(location);
this.pfield = pfield;
+ if(location.indexOf('=') > -1)
+ this.schema = location.substring( location.indexOf('=')+ 1);
+
if(System.getProperty("ibatis") != null)
{
iBatis = true;
@@ -431,7 +434,7 @@ public class DatabaseDocument extends Document
*/
private ByteBuffer[] getGff(ChadoDAO dao, String parentFeatureID)
throws java.sql.SQLException
- {
+ {
final int srcfeature_id = Integer.parseInt(parentFeatureID);
// build srcfeature object
@@ -840,7 +843,7 @@ public class DatabaseDocument extends Document
throws java.sql.SQLException
{
ChadoFeature feature = dao.getSequence(Integer.parseInt(feature_id));
-
+
buff.append("##FASTA\n>");
buff.append(feature.getUniquename());
buff.append("\n");
@@ -899,7 +902,7 @@ public class DatabaseDocument extends Document
((IBatisDAO) dao).startTransaction();
schema_list = dao.getSchema();
- Iterator it = schema_list.iterator();
+ Iterator it = schema_list.iterator();
while(it.hasNext())
{
@@ -950,7 +953,7 @@ public class DatabaseDocument extends Document
*/
private ChadoDAO getDAO()
throws java.net.ConnectException, SQLException
- {
+ {
if(!iBatis)
{
if(jdbcDAO == null)
@@ -958,7 +961,7 @@ public class DatabaseDocument extends Document
return jdbcDAO;
}
else
- {
+ {
if(connIB == null)
connIB = new IBatisDAO(pfield);
return connIB;
--
GitLab