--- FM2SQL/Attic/Convert.java	2004/08/16 10:16:27	1.74
+++ FM2SQL/Attic/Convert.java	2004/08/17 09:12:22	1.75
@@ -77,7 +77,7 @@ class Convert
   static Vector databases = new Vector();
   final static int numHits = 5000;
   final static int numIntervalls = 4;
-  static boolean debug = false;
+  static boolean debug = true;
   public static void main(String args[])
   {
     /*    try
@@ -2061,6 +2061,7 @@ class Convert
         int endIndex = -1;
         String tempQuery = query;
         String destQuery = query.replaceAll(names.get(tbIndex).toString(), destTableName);
+        destQuery = removeLayoutPartFromQuery(destQuery,layouts.get(tbIndex).toString());
         // TODO remove layout part for destQuery
         String tempQueryDest = destQuery;
         // remove extra query parts destQuery.substring(0,destQuery.lastIndexOf(destTableName)+destTableName.length()+1);
@@ -2168,6 +2169,7 @@ class Convert
           System.out.println("found list " + idList);
           Statement stm = beanDest.getConnection().createStatement();
           Vector destTables = beanDest.getTableNames();
+          System.out.println("tempQueryDest"+tempQueryDest);
           beanDest.makeQuery(tempQueryDest,0);
           for (Iterator iter = idList.iterator(); iter.hasNext();)
           {
@@ -2229,7 +2231,19 @@ class Convert
       dialog.setVisible(false);
     }
   }
-  private static void performSynchronize(
+  /**
+	 * @param destQuery
+	 * @param string
+	 * @return
+	 */
+	private static String removeLayoutPartFromQuery(String destQuery, String layoutName)
+	{
+	   String removeString ="layout "+bean.getQC()+layoutName+bean.getQC();
+	   destQuery =destQuery.replaceFirst(removeString,"");	
+	   System.out.println("destQuery change to "+destQuery);	
+	   return destQuery;
+	}
+	private static void performSynchronize(
     String idField,
     Vector vec,
     String tempQuery,