--- FM2SQL/Attic/Convert.java	2004/03/03 12:14:47	1.44
+++ FM2SQL/Attic/Convert.java	2004/03/09 12:34:09	1.45
@@ -274,11 +274,12 @@ class Convert
         names = bean.getTableNames();
       // Collections.sort(names);
       int tbIndex = 1;
-
+      
       // System.out.println("Start at "+names.indexOf("archimedes_facsimiles"));
       for (tbIndex = 0; tbIndex < names.size(); ++tbIndex)
       {
         Vector[] result = null;
+        String destTableName = "";
         try
         {
           query = "select * from " + bean.getQC() + names.get(tbIndex).toString() + bean.getQC();
@@ -305,6 +306,18 @@ class Convert
         {
           continue;
         }
+        // determine destTableName from createStatement or from source table name
+          if(!creates.get(tbIndex).equals(""))
+          {
+            String create =creates.get(tbIndex).toString().toLowerCase();
+            int fromIndex = create.indexOf("table")+5;
+            int toIndex   = create.indexOf("(");
+            destTableName = create.substring(fromIndex,toIndex).replaceAll(beanDest.getQC(),"").trim();
+            System.out.println("destTable "+destTableName);
+            
+          } else
+            destTableName = convertText(names.get(tbIndex).toString());
+
         //beanDest.setConnection("jdbc:postgresql://erebos/test3");
         beanDest.setConnection(destination);
 
@@ -328,7 +341,8 @@ class Convert
 
         command.append("UPDATE ");
         command.append(beanDest.getQC());
-        command.append(convertText((String) names.get(tbIndex)));
+        command.append(destTableName);
+        //command.append(convertText((String) names.get(tbIndex)));
         command.append(beanDest.getQC());
         command.append(" SET  ");
 
@@ -528,18 +542,21 @@ class Convert
         // System.out.println(beanDest.getTableNames(beanDest.getCatalogs().get(2).toString()));
         stm = beanDest.getConnection().createStatement();
         // System.exit(0);
-        if (mode == Convert.DataBase.CONVERT_MODE)
+      
+      // determine destTableName from createStatement or from source table name
+        if(!creates.get(tbIndex).equals(""))
         {
-          if(!creates.get(tbIndex).equals(""))
-          {
-            String create =creates.get(tbIndex).toString().toLowerCase();
-            int fromIndex = create.indexOf("table")+5;
-            int toIndex   = create.indexOf("(");
-            destTableName = create.substring(fromIndex,toIndex).replaceAll(beanDest.getQC(),"").trim();
-            System.out.println("destTable "+destTableName);
+          String create =creates.get(tbIndex).toString().toLowerCase();
+          int fromIndex = create.indexOf("table")+5;
+          int toIndex   = create.indexOf("(");
+          destTableName = create.substring(fromIndex,toIndex).replaceAll(beanDest.getQC(),"").trim();
+          System.out.println("destTable "+destTableName);
             
-          } else
-            destTableName = convertText(names.get(tbIndex).toString());
+        } else
+          destTableName = convertText(names.get(tbIndex).toString());
+
+        if (mode == Convert.DataBase.CONVERT_MODE)
+        {
 
           if (tables.indexOf(destTableName) >= 0)
           {