--- FM2SQL/Attic/DBBean.java	2004/05/11 09:06:38	1.19
+++ FM2SQL/Attic/DBBean.java	2004/06/21 11:31:35	1.23
@@ -16,6 +16,7 @@
 
 import java.sql.*;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.util.*;
 
 import com.fmi.jdbc.*;
@@ -188,11 +189,11 @@ public class DBBean
   {
       // setup the properties 
        java.util.Properties prop = new java.util.Properties();
-       prop.put("charSet", "Cp1256");
+     // prop.put("charSet", "MacCentralEurope");
        prop.put("user", user);
        prop.put("password", passwd);
     System.out.println("url "+url);
-    if(url.indexOf("odbc")>=0)
+    if(url.indexOf("fmpro")>=0)
     {
     // Connect to the database
       connection = DriverManager.getConnection(url, prop);
@@ -377,7 +378,7 @@ public class DBBean
    *   Returns the result for select * from table
    *   with maxHits = 500 default value
    */
-  public Vector[] getQueryData(String table) throws SQLException
+  public Vector[] getQueryData(String table) throws SQLException,ParseException
   {
 
     return getQueryData("SELECT * from " + quoteChar + table + quoteChar, maxHits);
@@ -457,7 +458,7 @@ public class DBBean
    *    Returns the result of the query
    *    or an Vector array of Vectors containing error messages
    */
-  public Vector[] getQueryData(String query, int maxHits) throws SQLException
+  public Vector[] getQueryData(String query, int maxHits) throws SQLException, ParseException
   {
     long timeStart = System.currentTimeMillis();
     ResultSet resultSet = null;
@@ -586,9 +587,25 @@ public class DBBean
           // method returns a java.awt.Image object for FileMaker Pro
           // container fields
 
-          tableRow.addElement(resultSet.getDate(i));
-          m_columnClasses.addElement(java.sql.Date.class);
-        } else if (metaData.getColumnTypeName(i) == "NUMBER")
+					try
+			 {
+				 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);      
+			 }
+     } else if (metaData.getColumnTypeName(i) == "NUMBER")
         {
           // use the ResultSet.getObject method for retieving images
           // from FileMaker Pro container fields; the ResultSet.getObject
@@ -1362,10 +1379,31 @@ public class DBBean
           byte[] b = null;
           if (metaData instanceof ResultSetMetaDataExt)
             b = resultSet.getBytes(i);
+       /*   if (b != null)
+          {
+            java.io.ByteArrayInputStream stream = (java.io.ByteArrayInputStream) resultSet.getBinaryStream(i);
+            //    System.out.println(" stream "+resultSet.getBinaryStream(i));
+            byte[] c = new byte[stream.available()];
+            int length = stream.read(c, 0, c.length);
+            int count = 0;
+            b = new byte[c.length];
+            for (int n = 0; n < length; ++n)
+            {
+
+              if (c[n] != 0)
+              {
+                //     System.out.println(c[n]+" "+(int)'?'+" "+(char)c[n]+" "+count+" "+b.length);
+                b[count++] = c[n];
+              }
+            }
+            byte[] bCopy = new byte[count];
+            System.arraycopy(b, 0, bCopy, 0, count);
+            b = bCopy;
+          }*/
           String utf8 = null;
-          utf8 = (b == null) ? null : new String(b);
+          utf8 = (b == null) ? null : new String(b,"MacRoman");
           if (metaData instanceof ResultSetMetaDataExt)
-            tableRow.addElement((b != null) ? new String(utf8.getBytes()) : null);
+            tableRow.addElement((b != null) ? Convert.normanToUnicode(resultSet.getString(i)) : null);
           else
           {
             if(url.toLowerCase().indexOf("odbc")>=0)
@@ -1469,5 +1507,4 @@ public class DBBean
     metaData = (this.result==null) ?null:this.result.getMetaData();
     return t;
 	}
-	
 }
\ No newline at end of file