Changeset 15948 for greenstone3

Timestamp:

2008-06-10T13:44:47+12:00 (16 years ago)

Author:

xiao

Message:

 

Location:

greenstone3/trunk/src/java/org/greenstone/gsdl3/sql

Files:

• DatabaseFactory.java (modified) (1 diff)
• derby/DerbyDBWrapper.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java

@@ -42 +42 @@
     return null; 
     }
+
+   public static final SQLStatements getSQLStatements(String sqlstate){
+       String fullsqlstate = "org.greenstone.gsdl3.sql." + sqlstate;
+    //load SQLStatements class
+       try{
+       SQLStatements state = (SQLStatements)Class.forName(fullsqlstate).newInstance(); 
+       return state;
+       }
+       catch (Exception e) {
+       // if falied use sqlstate as a full path
+       try{
+           SQLStatements state = (SQLStatements)Class.forName(sqlstate).newInstance(); 
+           return state;
+       }
+       catch (Exception e2) {
+           // failed again, give up
+           logger.info("Couldn't load the sql statement  "+ sqlstate);
+       }
+       }
+        
+       return null; 
+   }
 
     public static final MetadataDBWrapper getMetadataDBWrapper(String dbname, String sqlstate){

greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java

@@ -86 +86 @@
        while(rs.next()){
            HashMap arow = new HashMap();
-           for(int i = 1; i < numOfColumns ; i++){
-           arow.put(rsmd.getColumnName(i), rs.getObject(i));
+           for(int i = 1; i <= numOfColumns ; i++){
+           arow.put(rsmd.getColumnName(i).toLowerCase(), rs.getObject(i));
            }
            results.add(arow);