--- FM2SQL/Attic/Convert.java	2004/06/21 11:31:35	1.58
+++ FM2SQL/Attic/Convert.java	2004/06/22 10:33:53	1.59
@@ -1218,6 +1218,8 @@ class Convert
         Node node3 = root.find("convert/source/database", new int[] { 1, 1, i });
         Node nodeMode = root.find("convert/source/database/mode", new int[] { 1, 1, i, 1, 1 });
         Node delimiterNode = root.find("convert/source/database/delimiter", new int[] { 1, 1, i, 1, 1 });
+        Node useNormanToUnicodeMapper = root.find("convert/source/database/usenormantounicodemapper", new int[] { 1, 1, i, 1, 1 });
+    
         if (node3 == null)
           throw new Error("parse error database tag missing");
         if (node == null)
@@ -1228,6 +1230,12 @@ class Convert
           throw new Error("parse error password tag missing");
         if (delimiterNode != null)
           delimiter = delimiterNode.getCharacters();
+        if(useNormanToUnicodeMapper!=null)
+        {
+          database.setUseNormanToUnicodeMapper(Boolean.valueOf(useNormanToUnicodeMapper.getCharacters()).booleanValue());
+          System.out.println("useMapper "+Boolean.valueOf(useNormanToUnicodeMapper.getCharacters().trim()).booleanValue());
+        } 
+   
         String url = node.getCharacters();
         String user = node1.getCharacters();
         String password = node2.getCharacters();
@@ -1391,9 +1399,16 @@ class Convert
         Node node3 = root.find("convert/source/database", new int[] { 1, 1, i });
         Node nodeMode = root.find("convert/source/database/mode", new int[] { 1, 1, i, 1, 1 });
         Node delimiterNode = root.find("convert/source/database/delimiter", new int[] { 1, 1, i, 1, 1 });
+        Node useNormanToUnicodeMapper = root.find("convert/source/database/usenormantounicodemapper", new int[] { 1, 1, i, 1, 1 });
 
         if (delimiterNode != null)
           delimiter = delimiterNode.getCharacters();
+        if(useNormanToUnicodeMapper!=null)
+        {
+          database.setUseNormanToUnicodeMapper(Boolean.valueOf(useNormanToUnicodeMapper.getCharacters()).booleanValue());
+          System.out.println("useMapper "+Boolean.valueOf(useNormanToUnicodeMapper.getCharacters().trim()).booleanValue());
+        } 
+
         if (node3 == null)
           throw new Error("parse error database tag missing");
         if (node == null)
@@ -1582,6 +1597,8 @@ class Convert
     Vector tables;
     Vector ids;
     String delimiter = "//";
+    boolean useNormanToUnicodeMapper = false;
+    
     final static int CONVERT_MODE = 1;
     final static int APPEND_MODE = 2;
     final static int UPDATE_MODE = 3;
@@ -1624,6 +1641,8 @@ class Convert
         modeString = "delete";
 
       buffr.write("      <mode>" + modeString + "</mode>\n");
+      buffr.write("      <usenormantounicodemapper>" + useNormanToUnicodeMapper + "</usenormantounicodemapper>\n");
+      
       int index = 0;
       while (index < tables.size())
       {