- Timestamp:
- 2012-05-22T13:01:04+12:00 (12 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java
r16883 r25635 11 11 12 12 public class DatabaseFactory{ 13 private static HashMap serverMap = new HashMap();13 private static HashMap<String, SQLServer> serverMap = new HashMap<String, SQLServer>(); 14 14 private static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.DatabaseFactory.class.getName()); 15 15 … … 29 29 public static final SQLServer getDatabaseServer(String dbname){ 30 30 dbname = properDBName(dbname); 31 if (serverMap.containsKey(dbname)) return (SQLServer)serverMap.get(dbname);31 if (serverMap.containsKey(dbname)) return serverMap.get(dbname); 32 32 String fullName = "org.greenstone.gsdl3.sql." + dbname.toLowerCase()+ "." + dbname +"SQLServer"; 33 33 try { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/MetadataDBWrapper.java
r16883 r25635 2 2 3 3 import java.util.ArrayList; 4 import java.util.HashMap; 4 5 5 6 import java.sql.ResultSet; … … 22 23 23 24 //return a list of rows 24 public ArrayList executeQuery(String query_statement);25 public ArrayList<HashMap<String, Object>> executeQuery(String query_statement); 25 26 26 27 public ResultSet queryResultSet(String query_statement); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java
r21321 r25635 30 30 if(sqlState == null) return null; 31 31 String dbInfoState = sqlState.getDBInfoStatement(id); 32 ArrayList result = executeQuery(dbInfoState);32 ArrayList<HashMap<String, Object>> result = executeQuery(dbInfoState); 33 33 if (result.size() == 0) return null; 34 34 DBInfo info = new DBInfo(); 35 35 for(int i=0; i<result.size();i++){ 36 HashMap arow = (HashMap)result.get(i);36 HashMap arow = result.get(i); 37 37 Iterator ite = arow.keySet().iterator(); 38 38 while(ite.hasNext()){ … … 90 90 } 91 91 92 public synchronized ArrayList executeQuery(String query_statement){92 public synchronized ArrayList<HashMap<String, Object>> executeQuery(String query_statement){ 93 93 //the database hasn't been correct yet 94 ArrayList results = new ArrayList();94 ArrayList<HashMap<String, Object>> results = new ArrayList<HashMap<String, Object>>(); 95 95 ResultSet rs = null; 96 96 try{ … … 101 101 int numOfColumns = rsmd.getColumnCount(); 102 102 while(rs.next()){ 103 HashMap arow = new HashMap();103 HashMap<String, Object> arow = new HashMap<String, Object>(); 104 104 for(int i = 1; i <= numOfColumns ; i++){ 105 105 arow.put(rsmd.getColumnName(i).toLowerCase(), rs.getObject(i));
Note:
See TracChangeset
for help on using the changeset viewer.