Added command line parameter output-file.

diff --git a/.anjuta/session/anjuta.session b/.anjuta/session/anjuta.session
index f6b6037dca42c961ee0da8ca188785e6e88cfe00..7e38a9667de5c86487c60e3fab0a8aeef34e8e1e 100644 (file)
--- a/.anjuta/session/anjuta.session
+++ b/.anjuta/session/anjuta.session
@@ -2,16 +2,16 @@
 Maximized=1
 Geometry=1024x687+0+24
 
+[Project Manager]
+Shortcut=gdadbcopy//src//gdadbcopy
+Expand=gdadbcopy
+
 [File Loader]
-Files=../../src/main.c#10
+Files=../../src/main.c#527
 
 [Document Manager]
 bookmarks=<?xml version="1.0" encoding="UTF-8"?>\n<bookmarks/>\n
 
-[Project Manager]
-Shortcut=gdadbcopy//src//gdadbcopy
-Expand=gdadbcopy
-
 [Execution]
 Run in terminal=2
 Working directories=../../../gdadbcopy

diff --git a/.anjuta/session/dock-layout.xml b/.anjuta/session/dock-layout.xml
index aea89b1faebbc6a1b19d34282bb8b28625d15cf8..3b61c4dd2941e68d171b3c14226b60a0f611f1c2 100644 (file)
--- a/.anjuta/session/dock-layout.xml
+++ b/.anjuta/session/dock-layout.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0"?>
-<dock-layout>
-       
-<layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="760"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaDocumentManager" orientation="vertical" locked="no"/><item name="AnjutaDevhelpDisplay" orientation="vertical" locked="no"/><item name="AnjutaTerminal" orientation="vertical" locked="no"/></notebook><paned orientation="vertical" locked="no" position="241"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaProjectManager" orientation="vertical" locked="no"/><item name="AnjutaFileManager" orientation="vertical" locked="no"/></notebook><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaSymbolDB" orientation="vertical" locked="no"/><item name="AnjutaDevhelpIndex" orientation="vertical" locked="no"/></notebook></paned></paned></dock></layout></dock-layout>
+<dock-layout><layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="760"><notebook orientation="vertical" locked="no" page="2"><item name="AnjutaDocumentManager" orientation="vertical" locked="no"/><item name="AnjutaDevhelpDisplay" orientation="vertical" locked="no"/><item name="AnjutaTerminal" orientation="vertical" locked="no"/></notebook><paned orientation="vertical" locked="no" position="241"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaProjectManager" orientation="vertical" locked="no"/><item name="AnjutaFileManager" orientation="vertical" locked="no"/></notebook><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaSymbolDB" orientation="vertical" locked="no"/><item name="AnjutaDevhelpIndex" orientation="vertical" locked="no"/></notebook></paned></paned></dock></layout></dock-layout>

diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db
index c8b7601ae068d8c59443796cbba6a82f658872bf..76de4102e41d84f1db60630974d7507fa49200dc 100644 (file)
Binary files a/.anjuta_sym_db.db and b/.anjuta_sym_db.db differ

diff --git a/src/main.c b/src/main.c
index 9ec049e8973ffdebfda5a6b50fb2ac3fe3da4773..f8bf60fa1b61f61dce4441f86b32ac9b641c6470 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,16 +25,21 @@
 static gchar *ref_db_cnc = NULL;
 static gchar *db_cnc = NULL;
 static gboolean drop_tables = FALSE;
+static gchar *output_file = NULL;
 static gboolean verbose = FALSE;
 
 static GdaConnection *gda_conn_ref_db;
 static GdaConnection *gda_conn_db;
 
+static xmlDoc *xdoc;
+static xmlNode *xroot;
+
 static GOptionEntry entries[] =
 {
        { "ref-db-cnc", 0, 0, G_OPTION_ARG_STRING, &ref_db_cnc, "Reference database connection string", "CNC_STRING" },
        { "db-cnc", 0, 0, G_OPTION_ARG_STRING, &db_cnc, "Database connection string", "CNC_STRING" },
        { "drop-tables", 0, 0, G_OPTION_ARG_NONE, &drop_tables, "Drop tables before creating new ones", NULL },
+       { "output-file", 0, 0, G_OPTION_ARG_FILENAME, &output_file, "Ouput the whole operation in an xmlfile", "FILENAME" },
        { "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, "Verbose", NULL },
        { NULL }
 };
@@ -172,6 +177,24 @@ copy_data ()
                                                                                           (error != NULL && error->message != NULL ? error->message : "no details."));
                                                                        continue;
                                                                }
+
+                                                       if (output_file != NULL)
+                                                               {
+                                                                       xmlNode *xnode;
+
+                                                                       xnode = xmlNewNode (NULL, "insert_into");
+                                                                       error = NULL;
+                                                                       sql = gda_statement_to_sql_extended (stmt,
+                                                                                                            gda_conn_db,
+                                                                                                            params,
+                                                                                                            GDA_STATEMENT_SQL_PARAMS_AS_VALUES,
+                                                                                                            NULL,
+                                                                                                            &error);
+
+                                                                       xmlNodeSetContent (xnode, sql);
+                                                                       xmlAddChild (xroot, xnode);
+                                                                       g_free (sql);
+                                                               }
                                                }
                                        g_printf ("\n");
 
@@ -423,6 +446,20 @@ read_tables ()
 
                                        read_fields (table, op);
 
+                                       if (output_file != NULL)
+                                               {
+                                                       error = NULL;
+                                                       xmlAddChild (xroot,
+                                                                    gda_server_operation_save_data_to_xml (op,
+                                                                                                           &error));
+                                                       if (error != NULL)
+                                                               {
+                                                                       g_warning ("Error on saving GdaServerOperation to xml: %s.",
+                                                                                  error->message != NULL ? error->message : "no details");
+                                                                       continue;
+                                                               }
+                                               }
+
                                        error = NULL;
                                        if (!gda_connection_perform_operation (gda_conn_db, op, &error))
                                                {
@@ -584,6 +621,20 @@ read_views ()
                                                        continue;
                                                }
 
+                                       if (output_file != NULL)
+                                               {
+                                                       error = NULL;
+                                                       xmlAddChild (xroot,
+                                                                    gda_server_operation_save_data_to_xml (op,
+                                                                                                           &error));
+                                                       if (error != NULL)
+                                                               {
+                                                                       g_warning ("Error on saving GdaServerOperation to xml: %s.",
+                                                                                  error->message != NULL ? error->message : "no details");
+                                                                       continue;
+                                                               }
+                                               }
+
                                        g_free (view_def);
                                        g_free (view_name);
 
@@ -648,6 +699,12 @@ main (int argc, char *argv[])
                        return;
                }
 
+       if (output_file != NULL)
+               {
+                       /* initialize output file */
+                       xroot = xmlNewNode (NULL, "gdadbcopy");
+               }
+
        update_metastore ();
 
        g_printf ("* Reading tables of reference database (%s).\n",
@@ -661,6 +718,15 @@ main (int argc, char *argv[])
        g_printf ("* Reading views.\n");
        read_views ();
 
+       if (output_file != NULL)
+               {
+                       /* initialize output file */
+                       xdoc = xmlNewDoc ("1.0");
+                       xmlDocSetRootElement (xdoc, xroot);
+                       xmlSaveFormatFile (output_file, xdoc, 2);
+                       xmlFreeDoc (xdoc);
+               }
+
        g_object_unref (gda_conn_ref_db);
        g_object_unref (gda_conn_db);
 

diff --git a/tests/db.db b/tests/db.db
index 2dd433b277d62bed76ba1fcd5b9e5aecfa55e722..3acae74c67fb1993f874253949d4aa9a3f8b9ce9 100644 (file)
Binary files a/tests/db.db and b/tests/db.db differ