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

Bug #606728: Catch errors when opening saved-reports-2.4 for write.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18596 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler
2010-01-31 21:12:21 +00:00
parent b61418df3f
commit bb471903d5
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/report/report-system/report.scm
View File

@@ -567,35 +567,46 @@
(define gnc:current-saved-reports
(gnc-build-dotgnucash-path "saved-reports-2.4"))
(define (gnc:open-saved-reports mode)
(let ((conf-file-name gnc:current-saved-reports))
(catch #t
(lambda () (open-file conf-file-name mode))
(lambda (key . args)
(gnc-error-dialog
'()
(string-append (_ "Could not open the file: ") conf-file-name (_ ". The error is: ") (symbol->string key) " - " (car (caddr args)) "."))
#f))))
(define (gnc:report-save-to-savefile report)
(let* ((conf-file-name gnc:current-saved-reports)
(saved-form (gnc:report-generate-saved-forms report))
(let* ((saved-form (gnc:report-generate-saved-forms report))
;; Immediate evaluate the saved form to both load it into the
;; runtime, but also so we can check if it's "allowed" to actually
;; be written to the saved reports file by inspecting the result.
;; #Bug#342206.
(save-result (eval-string saved-form)))
(if (record? save-result)
(let ((report-port (open-file conf-file-name "a")))
(display saved-form report-port)
(close report-port)
(let ((report-name (gnc:report-name report)))
(gnc-info-dialog
'()
(sprintf
#f (_ "Your report \"%s\" has been saved into the configuration file \"%s\".")
(if (and report-name (not (string-null? report-name)))
(gnc:gettext report-name)
(gnc:gettext "Untitled"))
conf-file-name)))
))))
(let ((report-port (gnc:open-saved-reports "a")))
(if report-port
(begin
(display saved-form report-port)
(close report-port)
(let ((report-name (gnc:report-name report)))
(gnc-info-dialog
'()
(sprintf
#f (_ "Your report \"%s\" has been saved into the configuration file \"%s\".")
(if (and report-name (not (string-null? report-name)))
(gnc:gettext report-name)
(gnc:gettext "Untitled"))
gnc:current-saved-reports)))
))))))
(define (gnc:report-template-save-to-savefile report-template)
(let* ((conf-file-name gnc:current-saved-reports)
(saved-form (gnc:report-template-generate-saved-forms report-template))
(report-port (open-file conf-file-name "a")))
(display saved-form report-port)
(close report-port)))
(let* ((report-port (gnc:open-saved-reports "a")))
(if report-port
(let ((saved-form (gnc:report-template-generate-saved-forms report-template)))
(display saved-form report-port)
(close report-port)))))
;; save all custom reports, moving the old version of the
;; saved-reports file aside as a backup