Added function GdaExQueryEditor::load_tables_from_file.

diff --git a/src/queryeditor.c b/src/queryeditor.c
index 1fc0ae52bd7d81fdeb1daa66f22abc404e91938a..8e321d9a2d526f6dd9b1784e1b01738357d9ea7d 100644 (file)
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -1392,6 +1392,25 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
                }
 }
 
+void
+gdaex_query_editor_load_tables_from_file (GdaExQueryEditor *qe,
+                                          const gchar *filename,
+                                          gboolean clean)
+{
+       xmlDoc *xdoc;
+       xmlNode *xroot;
+
+       xdoc = xmlParseFile (filename);
+       if (xdoc != NULL)
+               {
+                       xroot = xmlDocGetRootElement (xdoc);
+                       if (xroot != NULL)
+                               {
+                                       gdaex_query_editor_load_tables_from_xml (qe, xroot, TRUE);
+                               }
+               }
+}
+
 void
 gdaex_query_editor_clean_choices (GdaExQueryEditor *qe)
 {

diff --git a/src/queryeditor.h b/src/queryeditor.h
index 40b41020ce1e694a6478feecf5acb706cb8f50c4..232e8ee4f48ad69d28b5b84ea78eea1f278c3153 100644 (file)
--- a/src/queryeditor.h
+++ b/src/queryeditor.h
@@ -157,6 +157,9 @@ gboolean gdaex_query_editor_add_relation (GdaExQueryEditor *qe,
 void gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
                                               xmlNode *root,
                                               gboolean clean);
+void gdaex_query_editor_load_tables_from_file (GdaExQueryEditor *qe,
+                                               const gchar *filename,
+                                               gboolean clean);
 
 void gdaex_query_editor_clean_choices (GdaExQueryEditor *qe);
 

diff --git a/tests/query_editor.c b/tests/query_editor.c
index ce3cc8250b19cc1bb9ec5d9b928c2c72c0c34a59..d6a9fcc6ccb3cdd121e54f9772fa8f42c7fe1981 100644 (file)
--- a/tests/query_editor.c
+++ b/tests/query_editor.c
@@ -235,18 +235,7 @@ main (int argc, char *argv[])
 
        if (xmlfile != NULL)
                {
-                       xmlDoc *xdoc;
-                       xmlNode *xroot;
-
-                       xdoc = xmlParseFile (xmlfile);
-                       if (xdoc != NULL)
-                               {
-                                       xroot = xmlDocGetRootElement (xdoc);
-                                       if (xroot != NULL)
-                                               {
-                                                       gdaex_query_editor_load_tables_from_xml (qe, xroot, TRUE);
-                                               }
-                               }
+                       gdaex_query_editor_load_tables_from_file (qe, xmlfile, TRUE);
                }
        else
                {