--- FM2SQL/Attic/Convert.java	2004/01/15 08:27:09	1.9
+++ FM2SQL/Attic/Convert.java	2004/01/15 13:26:06	1.10
@@ -788,7 +788,8 @@ class Convert
       Vector layouts = new Vector();
       Vector selects = new Vector();
       Vector creates = new Vector();
-			int mode = -1;
+			Vector ids     = new Vector();
+      int mode = -1;
    
       try
       {
@@ -804,7 +805,7 @@ class Convert
           layouts = new Vector();
           selects = new Vector();
           creates = new Vector();
-
+          ids     = new Vector();
          // parse dataBase
           Node node = root.find("convert/source/database/url", new int[] { 1, 1, i, 1 });
           Node node1 = root.find("convert/source/database/user", new int[] { 1, 1, i, 1, 1 });
@@ -860,11 +861,15 @@ class Convert
             // if(node6==null) throw new Error("parse error create tag missing");
             String name = (String)node4.attributes.get("name");
             String layout = (String)node4.attributes.get("layout");
+            String id = (String)node4.attributes.get("id");
+            System.out.println("id was "+id);
             if(name==null) throw new Error("parse error required table tag attribute name missing");
             if(layout==null) layout ="";
+            if(id==null)  id = "";
             if(name.equals("")) throw new Error("parse error table tag attribute must not be empty");
             tables.add(name);
             layouts.add(layout);
+            ids.add(id);
             String query = (node5==null) ? "":node5.getCharacters(); 
             if(query.equals("")) System.err.println("Warning empty select tag or  select tag missing !!");
             query = (query.equals("")) ? "select * from "+database.getQC()+name+database.getQC():query;
@@ -874,7 +879,7 @@ class Convert
               creates.add("");
             
           }
-          databases.add(new DataBase(database, tables, layouts, selects,creates,mode));
+          databases.add(new DataBase(database, tables, layouts, selects,creates,ids,mode));
         }
         DBBean database = new DBBean();
         // parse dataBase
@@ -1020,6 +1025,8 @@ class Convert
        Vector layouts = new Vector();
        Vector selects = new Vector();
        Vector creates = new Vector();
+       Vector ids     = new Vector();
+       
        int mode = -1;
        try
        {
@@ -1035,7 +1042,7 @@ class Convert
            layouts = new Vector();
            selects = new Vector();
            creates = new Vector();
-
+           ids     = new Vector();
           // parse dataBase
            Node node = root.find("convert/source/database/url", new int[] { 1, 1, i, 1 });
            Node node1 = root.find("convert/source/database/user", new int[] { 1, 1, i, 1, 1 });
@@ -1093,11 +1100,16 @@ class Convert
              // if(node6==null) throw new Error("parse error create tag missing");
              String name = (String)node4.attributes.get("name");
              String layout = (String)node4.attributes.get("layout");
+             String id = (String)node4.attributes.get("id");
+             System.out.println("id was "+id);
+         
              if(name==null) throw new Error("parse error required table tag attribute name missing");
              if(layout==null) layout ="";
+             if(id == null)  id="";
              if(name.equals("")) throw new Error("parse error table tag attribute must not be empty");
              tables.add(name);
              layouts.add(layout);
+             ids.add(id);
              String query = (node5==null) ? "":node5.getCharacters(); 
              if(query.equals("")) System.err.println("Warning empty select tag or  select tag missing !!");
              query = (query.equals("")) ? "select * from "+database.getQC()+name+database.getQC():query;
@@ -1107,7 +1119,7 @@ class Convert
                creates.add("");
             
            }
-           databases.add(new DataBase(database, tables, layouts, selects,creates,mode));
+           databases.add(new DataBase(database, tables, layouts, selects,creates,ids,mode));
          }
          DBBean database = new DBBean();
          // parse dataBase
@@ -1120,7 +1132,7 @@ class Convert
          System.out.println(url);
          database.setURL(url.trim());
          database.setUserAndPasswd(user.trim(), password.trim());
-         databases.add(new DataBase(database,null,null,null,null,0));
+         databases.add(new DataBase(database,null,null,null,null,null,0));
          //databases.add(database);
     /*    for (Iterator iter = databases.iterator(); iter.hasNext();)
        {
@@ -1200,18 +1212,20 @@ public static class DataBase
   Vector selects;
   Vector layouts;
   Vector tables;
+  Vector ids;
   final static int CONVERT_MODE = 1;
 	final static int APPEND_MODE  = 2;
 	final static int UPDATE_MODE  = 3;
   int mode = -1;
   
-  public DataBase(DBBean bean,Vector tables,Vector layouts,Vector selects,Vector creates,int mode)
+  public DataBase(DBBean bean,Vector tables,Vector layouts,Vector selects,Vector creates,Vector ids,int mode)
   {
     this.bean = bean;
     this.tables = tables;
     this.layouts = layouts;
     this.selects = selects;
     this.creates = creates;
+    this.ids     = ids;
     this.mode = mode;
   }
   public void exportToXML(BufferedWriter buffr) throws Exception
@@ -1238,8 +1252,9 @@ public static class DataBase
        String layout=(String)layouts.get(index);
        String select=(String)selects.get(index);
        String create=(String)creates.get(index);
+       String id=(String)ids.get(index);
    
-       buffr.write("      <table name = \""+table+"\" layout = \""+layout+"\">\n");
+       buffr.write("      <table name = \""+table+"\" layout = \""+layout+"\" id = \""+id+"\" +>\n");
        buffr.write("         <select>"+ convertToEntities(select)+"</select>\n");
        if(!create.equals(""))
        buffr.write("         <create>"+create+"         </create>\n");