--- FM2SQL/Attic/DBBean.java	2004/06/21 11:31:35	1.23
+++ FM2SQL/Attic/DBBean.java	2004/06/22 10:33:53	1.24
@@ -66,6 +66,7 @@ import com.fmi.jdbc.*;
  */
 public class DBBean
 {
+  private boolean useNormanToUnicodeMapper=false;
   Connection connection;
   String url = "";
   DatabaseMetaData dbMetaData;
@@ -1401,9 +1402,20 @@ public class DBBean
             b = bCopy;
           }*/
           String utf8 = null;
-          utf8 = (b == null) ? null : new String(b,"MacRoman");
+          utf8 = (b == null) ? null : new String(b);
           if (metaData instanceof ResultSetMetaDataExt)
-            tableRow.addElement((b != null) ? Convert.normanToUnicode(resultSet.getString(i)) : null);
+          {
+            String rowElement = "";
+            if (b != null)
+            {
+              rowElement = resultSet.getString(i);
+              if(useNormanToUnicodeMapper)
+              rowElement = Convert.normanToUnicode(rowElement);
+              tableRow.addElement(rowElement);
+
+            } else
+              tableRow.addElement(null);
+          }
           else
           {
             if(url.toLowerCase().indexOf("odbc")>=0)
@@ -1420,7 +1432,7 @@ public class DBBean
           }
         } catch (Exception e)
         {
-          System.out.println("Hey I Got an error" + e);
+          System.out.println("Hey I got an error" + e);
           e.printStackTrace();
         }
         // m_columnClasses.addElement(java.lang.String.class);
@@ -1507,4 +1519,20 @@ public class DBBean
     metaData = (this.result==null) ?null:this.result.getMetaData();
     return t;
 	}
+  /**
+   * @return
+   */
+  public boolean isUseNormanToUnicodeMapper()
+  {
+    return useNormanToUnicodeMapper;
+  }
+
+  /**
+   * @param b
+   */
+  public void setUseNormanToUnicodeMapper(boolean b)
+  {
+    useNormanToUnicodeMapper = b;
+  }
+
 }
\ No newline at end of file