--- FM2SQL/Attic/DBBean.java	2004/04/15 11:23:48	1.16
+++ FM2SQL/Attic/DBBean.java	2004/04/30 10:56:06	1.17
@@ -682,7 +682,13 @@ public class DBBean
     }
     stm.setMaxRows(numberOfHits);
     long time = System.currentTimeMillis();
+    try {
     stm.execute(query);
+    } catch(Exception e) {
+     // TODO remove
+     if(FM2SQL.fmInstance!=null)
+     FM2SQL.showErrorDialog("Error caught!! \n Query was  "+query+" \n","Debug Info");
+    }
     long time2 = System.currentTimeMillis();
    
     System.out.println("time to execute "+(time2-time));
@@ -1336,6 +1342,12 @@ public class DBBean
             tableRow.addElement((b != null) ? new String(utf8.getBytes()) : null);
           else
           {
+            if(url.toLowerCase().indexOf("odbc")>=0)
+           {
+               byte[] val = resultSet.getBytes(i);
+             tableRow.addElement((val==null) ? null:new String(val,"UTF-8"));
+      
+           } else
             //  byte[] val = resultSet.getBytes(i);
             tableRow.add(resultSet.getString(i));
             //tableRow.addElement((val==null) ? null:new String(val,"UTF-8"));