From a841ec7fb2c2e921bcee599edab357dfccad592e Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 1 Mar 2007 15:42:54 +0000
Subject: [PATCH] getDatabaseEntries changed how schema list is obtained
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@5548 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../sanger/artemis/util/DatabaseDocument.java | 21 ++++++-------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/uk/ac/sanger/artemis/util/DatabaseDocument.java b/uk/ac/sanger/artemis/util/DatabaseDocument.java
index 74802b692..022dcd594 100644
--- a/uk/ac/sanger/artemis/util/DatabaseDocument.java
+++ b/uk/ac/sanger/artemis/util/DatabaseDocument.java
@@ -1429,21 +1429,16 @@ public class DatabaseDocument extends Document
try
{
GmodDAO dao = getDAO();
- schema_list = dao.getOrganisms();
-
-
-/* Organism o = new Organism();
- o.setCommonName("web");
- schema_list.add(o);*/
-
+ schema_list = dao.getSchema(); //.getOrganisms();
Iterator it = schema_list.iterator();
db = new HashMap();
while(it.hasNext())
{
- Organism organism = (Organism)it.next();
- schema = organism.getCommonName();
+ //Organism organism = (Organism)it.next();
+ //schema = organism.getCommonName();
+ schema = (String)it.next();
reset((String)getLocation(), schema);
@@ -1462,12 +1457,8 @@ public class DatabaseDocument extends Document
Integer.toString(feature.getFeatureId()));
}
}
- catch(RuntimeException e)
- {
- }
- catch(java.sql.SQLException sqlExp)
- {
- }
+ catch(RuntimeException e){}
+ catch(java.sql.SQLException sqlExp){}
}
}
--
GitLab