--- FM2SQL/Attic/Convert.java	2003/12/10 12:25:12	1.2
+++ FM2SQL/Attic/Convert.java	2004/01/08 10:31:18	1.3
@@ -213,9 +213,22 @@ class Convert
     //dialog.title.setText("Writing table data ...");
     Vector row = null;
     //for (int j = 0; j < result[0].size(); ++j)
+    command = new StringBuffer();
+
+    command.append("INSERT  INTO ");
+    command.append(beanDest.getQC());
+    command.append(convertText((String) names.get(tbIndex)));
+    command.append(beanDest.getQC());
+    command.append(" values ( ");
+
+    for (int i = 0; i < bean.getColumnNames().size() - 1; ++i)
+      command.append("?,");
+    command.append("?)");
+    PreparedStatement pstm = beanDest.getConnection().prepareStatement(command.toString());
+    System.out.println(command);
     while((row=bean.getNextRow())!=null)
     {
-      //Vector row = (Vector) result[0].get(j);
+/*      //Vector row = (Vector) result[0].get(j);
       command = new StringBuffer();
 
         command.append("INSERT  INTO ");
@@ -223,8 +236,10 @@ class Convert
         command.append(convertText((String) names.get(tbIndex)));
         command.append(beanDest.getQC());
         command.append(" values ( ");
-        //print rows
+   */
+             //print rows
      Object obj = null;
+     /*
      for(int k=0;k<row.size()-1;++k)
      {
         obj = row.get(k);
@@ -253,6 +268,20 @@ class Convert
   // dialog.progress.setValue((int)(((double)(j+1)/(double)result[0].size())*100.0));
   // System.out.println( (int)(((double)(j+1)/(double)result[0].size())*100.0)+" "+result[0].size()+" "+j);
    command = null;
+*/
+    for (int k = 0; k < row.size(); ++k)
+    {
+      obj = row.get(k);
+      if (obj instanceof ArrayList)
+        obj = ((List) obj).get(0);
+      String str = (obj == null) ? "NULL" : obj.toString();
+      if (!str.equals("NULL"))
+        pstm.setString(k + 1, str);
+      else
+        pstm.setNull(k + 1, Types.NULL);
+    }
+    pstm.execute();
+
 }// to for loop    
    
     }
@@ -423,37 +452,51 @@ class Convert
     //for (int j = 0; j < result[0].size(); ++j)
     int j=-1;
     Vector row = null;
+    command = new StringBuffer();
+
+    command.append("INSERT  INTO ");
+    command.append(beanDest.getQC());
+    command.append(convertText((String) names.get(tbIndex)));
+    command.append(beanDest.getQC());
+    command.append(" values ( ");
+    
+    for(int i=0;i<bean.getColumnNames().size()-1;++i) command.append("?,");
+    command.append("?)");
+    PreparedStatement pstm = beanDest.getConnection().prepareStatement(command.toString());
+    System.out.println(command);
     int rowCount= bean.getRowCount(query);
     while((row=bean.getNextRow())!=null)
     {
       j++;
       // row = (Vector) result[0].get(j);
-      command = new StringBuffer();
+   /*   command = new StringBuffer();
 
         command.append("INSERT  INTO ");
         command.append(beanDest.getQC());
         command.append(convertText((String) names.get(tbIndex)));
         command.append(beanDest.getQC());
         command.append(" values ( ");
-        //print rows
+     */
+           //print rows
      Object obj = null;
-     for(int k=0;k<row.size()-1;++k)
+    /* for(int k=0;k<row.size()-1;++k)
      {
         obj = row.get(k);
         //System.out.println("row "+obj+" "+k);
        if(obj!=null&&!(obj instanceof ArrayList))
-       command.append("'"+convertUml(new String(obj.toString().getBytes("UTF-8"),"UTF-8"))+"',"); 
+       command.append("'"+convertUml(obj.toString())+"',"); 
        else if(obj!=null&&   obj instanceof ArrayList)
        command.append("'"+convertUml(((ArrayList)obj).get(0).toString())+"',"); 
        else command.append("NULL,");
      }
      obj = row.get(row.size() - 1);
      if (obj != null && !(obj instanceof ArrayList))
-     command.append("'"+convertUml(new String(obj.toString().getBytes("UTF-8"),"UTF-8"))+"')"); 
+     command.append("'"+convertUml(obj.toString())+"')"); 
       else
       if(obj!=null&&   obj instanceof ArrayList)
        command.append("'"+convertUml(((ArrayList)obj).get(0).toString())+"')");         //command.append(obj.toString()+")");
        else command.append("NULL)");
+      */
       //command.append("'"+row.get(row.size()-1)+"')"); 
       //command.append(" )");
       //  for(int k=0;k<row.size();++k)
@@ -461,7 +504,17 @@ class Convert
       // System.out.println();
       //   System.out.println(command+" "+j+" "+row.size()+" "+  ((Vector)result2[0].get(j)).size());
       // System.out.println(command);
-      stm.executeUpdate(command.toString());
+      for(int k=0;k<row.size();++k) 
+      {
+        obj = row.get(k);
+        if(obj instanceof ArrayList) obj=((List)obj).get(0);
+        String str =(obj==null) ? "NULL":obj.toString();
+        if(!str.equals("NULL"))
+        pstm.setString(k+1,str); 
+        else pstm.setNull(k+1,Types.NULL);
+      }
+      pstm.execute();
+      //stm.executeUpdate(command.toString());
       dialog.progress.setValue((int) (((double) (j + 1) / (double) rowCount) * 100.0));
 	// System.out.println( (int)(((double)(j+1)/(double)result[0].size())*100.0)+" "+result[0].size()+" "+j);
    command = null;
@@ -492,6 +545,13 @@ class Convert
     StringBuffer alterMe = new StringBuffer(newName.trim().toLowerCase());
     int length = alterMe.length();
     int j = 0;
+    int index=alterMe.indexOf(".fp5");
+    if ( index >= 0 )
+     {
+       alterMe.delete(index, index + 4);
+       length = length - 4;
+     }
+ 
     while (j < length)
     { 
       if (alterMe.charAt(j) == ' ')
@@ -560,6 +620,16 @@ class Convert
       alterMe.setCharAt(j, '_');
 
     }
+    else if (alterMe.charAt(j) == '.')
+    {
+      System.out.println("dube "+alterMe);
+      if(j==length-1)
+      {
+        alterMe.delete(j, j); 
+        length--;
+        continue;
+      }
+    }
 
     ++j;
   }