--- FM2SQL/Attic/DBBean.java	2004/03/12 11:48:57	1.10
+++ FM2SQL/Attic/DBBean.java	2004/04/15 11:23:48	1.16
@@ -1,7 +1,23 @@
+/*
+ * DBBean.java -- Class that ecapsulates all database actions 
+ * Filemake to SQL Converter 
+ * Copyright (C) 2004 Robert Gordesch (rogo@mpiwg-berlin.mpg.de) 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  Please read license.txt for the full details. A copy of
+ * the GPL may be found at http://www.gnu.org/copyleft/lgpl.html  You should
+ * have received a copy of the GNU General Public License along with this
+ * program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA  Created on 15.09.2003 by
+ * rogo  
+ */
 
 
 import java.sql.*;
+import java.text.DateFormat;
 import java.util.*;
+
 import com.fmi.jdbc.*;
 
 /**
@@ -555,8 +571,8 @@ public class DBBean
           // container fields
           try
           {
-            tableRow.addElement(new Integer(resultSet.getInt(i)));
-            m_columnClasses.addElement(Integer.class);
+            tableRow.addElement(new Double(resultSet.getDouble(i)));
+            m_columnClasses.addElement(Double.class);
 
           } catch (Exception e)
           {
@@ -574,7 +590,7 @@ public class DBBean
             if (number.length() > 0)
             {
               tableRow.addElement(null);
-              m_columnClasses.addElement(Integer.class);
+              m_columnClasses.addElement(Double.class);
             } else
               tableRow.addElement(null);
           }
@@ -651,6 +667,19 @@ public class DBBean
 
     if (!connection.isClosed())
       stm = connection.createStatement();
+    else {
+      
+      
+      try
+      {
+        connection = getConnection();
+        stm= connection.createStatement();
+      } catch (Exception e)
+      {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+    }
     stm.setMaxRows(numberOfHits);
     long time = System.currentTimeMillis();
     stm.execute(query);
@@ -1241,8 +1270,24 @@ public class DBBean
         // from FileMaker Pro container fields; the ResultSet.getObject
         // method returns a java.awt.Image object for FileMaker Pro
         // container fields
+          try
+          {
+            tableRow.addElement(resultSet.getDate(i));
 
-        tableRow.addElement(resultSet.getDate(i));
+          } catch (Exception e)
+          {
+            // work around for parse bug in FM JDBC Driver 
+            // for dates of format dd-mm-yyyy
+            String date=resultSet.getString(i);
+            date=date.replace('-','.');
+            java.text.DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,Locale.GERMAN);
+            java.util.Date d= dateFormat.parse(date);
+           // Calendar cal=Calendar.getInstance(Locale.GERMAN);
+           // cal.setTime(d);
+           // date=(cal.get(Calendar.YEAR))+"-"+(cal.get(Calendar.MONTH)+1)+"-"+cal.get(Calendar.DATE);
+            tableRow.addElement(new java.sql.Date(d.getTime()));
+             System.out.println("Date "+date);      
+          }
         //  m_columnClasses.addElement(java.sql.Date.class);
       } else if (metaData.getColumnTypeName(i) == "NUMBER")
       {
@@ -1252,7 +1297,7 @@ public class DBBean
         // container fields
         try
         {
-          tableRow.addElement(new Integer(resultSet.getInt(i)));
+          tableRow.addElement(new Double(resultSet.getDouble(i)));
           // m_columnClasses.addElement(Integer.class);
 
         } catch (Exception e)