--- FM2SQL/Attic/FM2SQL.java	2004/03/08 13:57:40	1.26
+++ FM2SQL/Attic/FM2SQL.java	2004/03/09 12:34:09	1.28
@@ -599,8 +599,8 @@ public class FM2SQL extends JFrame imple
     }
     if (command.equals("Delimiter"))
     {
-      new DelimiterDialog(fmInstance).setVisible(true); 
-      delimiter =  JOptionPane.showInputDialog(fmInstance,"Enter delimiter String",delimiter); 
+			new DelimiterDialog(fmInstance).setVisible(true); 
+      //delimiter =  JOptionPane.showInputDialog(fmInstance,"Enter delimiter String",delimiter); 
       
     }
 
@@ -1217,7 +1217,7 @@ public class FM2SQL extends JFrame imple
           if (columnName.equals("Layouts"))
           {
             
-            bean.makeQuery("select * from"+bean.getQC()+table+bean.getQC(),1);
+            bean.makeQuery("select * from"+bean.getQC()+table+bean.getQC()+" layout "+bean.getQC()+layout+bean.getQC(),1);
 
             Vector idVec = bean.getColumnNames();
             if (idVec == null)
@@ -1474,6 +1474,7 @@ public class FM2SQL extends JFrame imple
 			setTitle("Delimiter Editor");
 			setModal(true);
 			content = new JPanel(true);
+			delimiter.setText(fmInstance.delimiter);
 			ActionListener al = new ActionListener()
 			{
 				public void actionPerformed(ActionEvent e)