--- FM2SQL/Attic/DBBean.java	2004/09/20 09:00:58	1.32
+++ FM2SQL/Attic/DBBean.java	2004/10/29 10:28:10	1.37
@@ -378,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, ParseException
+  public Vector[] getQueryData(String table) throws SQLException, ParseException,Exception
   {
 
     return getQueryData("SELECT * from " + quoteChar + table + quoteChar, maxHits);
@@ -389,7 +389,7 @@ public class DBBean
    *    Returns the result of the query
    *    or an Vector array of Vectors containing error messages
    */
-  public Vector[] getQueryData(String query, FM2SQL.ProgressDialog dialog, int maxHits) throws SQLException
+  public Vector[] getQueryData(String query, FM2SQL.ProgressDialog dialog, int maxHits) throws SQLException,Exception
   {
     long timeStart = System.currentTimeMillis();
     ResultSet resultSet = null;
@@ -458,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, ParseException
+  public Vector[] getQueryData(String query, int maxHits) throws SQLException, ParseException,Exception
   {
     long timeStart = System.currentTimeMillis();
     ResultSet resultSet = null;
@@ -653,17 +653,26 @@ public class DBBean
           // if(resultSet.getObject(i)!=null) System.out.println(resultSet.getObject(i));
           try
           {
+          	String utf8 = null;
+          	if (metaData instanceof ResultSetMetaDataExt)
+            {
             byte[] b = resultSet.getBytes(i);
-            String utf8 = null;
+            
             if (metaData instanceof ResultSetMetaDataExt)
               utf8 = (b == null) ? null : new String(b);
             else
               utf8 = (b == null) ? null : new String(b, "UTF-8");
-            utf8 = (utf8 == null) ? null : new String(utf8.getBytes("UTF-8"), "UTF-8");
-            tableRow.addElement(utf8);
+            }
+             else
+              utf8=resultSet.getString(i);
+                
+             	//  utf8 = (utf8 == null) ? null : new String(utf8.getBytes("UTF-8"), "UTF-8");
+          	tableRow.addElement(utf8);
+            
           } catch (Exception e)
           {
             System.out.println("Hey I Got an error" + e);
+            e.printStackTrace();
           }
           m_columnClasses.addElement(java.lang.String.class);
         }
@@ -710,7 +719,7 @@ public class DBBean
    *   with the numberOfHits as maximum
    * @return the result as an ResultSet object
   */
-  public ResultSet makeQuery(String query, int numberOfHits) throws SQLException
+  public ResultSet makeQuery(String query, int numberOfHits) throws SQLException,Exception
   {
     result = null;
     Statement stm = null;
@@ -748,8 +757,10 @@ public class DBBean
     } catch (Exception e)
     {
       // TODO remove
-      if (FM2SQL.fmInstance != null)
+      if (Convert.isGUI&&Convert.debug)
         FM2SQL.showErrorDialog("Error caught!! \n Query was  " + query + " \n", "Debug Info");
+      e.printStackTrace();
+     throw e;
     }
 
     return result;
@@ -1529,7 +1540,7 @@ public class DBBean
     ResultSet result = this.result;
     String subQuery = query.substring(query.lastIndexOf(table) + table.length() + 1);
     System.out.println("subQuery " + subQuery);
-    makeQuery("select " + id + " from " + getQC() + table + getQC() + subQuery+"order by  "+id, numHits);
+    makeQuery("select " + getQC()+id+getQC() + " from " + getQC() + table + getQC() + subQuery, numHits);
     while (true)
     {
       Vector vec = getNextRow();