IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[gnc-plugin-page-report] use export-string/error

Browse Source
This commit is contained in:
Christopher Lam 2020-08-10 19:38:25 +08:00
parent 31185c963a
commit 37c1bd47de
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gnucash/gnome/gnc-plugin-page-report.c
View File

@ -1666,15 +1666,41 @@ gnc_plugin_page_report_export_cb( GtkAction *action, GncPluginPageReport *report
if (scm_is_pair (choice)) if (scm_is_pair (choice))
{ {
SCM file_scm; SCM type = scm_cdr (choice);
SCM res; SCM document = scm_call_3 (export_thunk, priv->cur_report, type, SCM_BOOL_F);
SCM get_export_string = scm_c_eval_string ("gnc:html-document-export-string");
SCM get_export_error = scm_c_eval_string ("gnc:html-document-export-error");
SCM export_string = scm_call_1 (get_export_string, document);
SCM export_error = scm_call_1 (get_export_error, document);
choice = SCM_CDR (choice); if (scm_is_string (export_string))
file_scm = scm_from_locale_string (filepath); {
GError *err = NULL;
res = scm_call_3 (export_thunk, priv->cur_report, choice, file_scm); gchar *exported = scm_to_utf8_string (export_string);
if (!g_file_set_contents (filepath, exported, -1, &err))
result = (res != SCM_BOOL_F); gnc_error_dialog (parent, "Error during export: %s", err->message);
g_free (exported);
if (err)
g_error_free (err);
}
else if (scm_is_string (export_error))
{
gchar *str = scm_to_utf8_string (export_error);
gnc_error_dialog (parent, "error during export: %s", str);
g_free (str);
}
else
{
/* compatibility path -- old report which does not effect
export-string and export-error during export code- call
with filepath */
SCM file = scm_from_locale_string (filepath);
scm_c_eval_string ("(issue-deprecation-warning \"Old report \
with export-thunk encountered. Please upgrade report to ignore filename \
and sets html-document export-string and/or export-error instead.\")");
scm_call_3 (export_thunk, priv->cur_report, type, file);
}
result = TRUE;
} }
else else
result = gnc_html_export_to_file (priv->html, filepath); result = gnc_html_export_to_file (priv->html, filepath);