From 563d17416088125f2eb50f49876dd7a652fc38f6 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 24 May 2012 15:43:25 +0200 Subject: [PATCH] Added function GdaExQueryEditor::load_tables_from_file. --- src/queryeditor.c | 19 +++++++++++++++++++ src/queryeditor.h | 3 +++ tests/query_editor.c | 13 +------------ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/queryeditor.c b/src/queryeditor.c index 1fc0ae5..8e321d9 100644 --- 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 40b4102..232e8ee 100644 --- 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 ce3cc82..d6a9fcc 100644 --- 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 { -- 2.49.0