[Gnucash-changes] r12912 - gnucash/trunk/src - Guile-side clean-up
for --namespace option.
Chris Shoemaker
chris at cvs.gnucash.org
Fri Jan 20 22:59:22 EST 2006
Author: chris
Date: 2006-01-20 22:59:22 -0500 (Fri, 20 Jan 2006)
New Revision: 12912
Trac: http://svn.gnucash.org/trac/changeset/12912
Removed:
gnucash/trunk/src/scm/path.scm
Modified:
gnucash/trunk/src/app-utils/gw-app-utils-spec.scm
gnucash/trunk/src/engine/gw-engine-spec.scm
gnucash/trunk/src/report/report-system/html-style-sheet.scm
gnucash/trunk/src/report/report-system/report.scm
gnucash/trunk/src/scm/command-line.scm
gnucash/trunk/src/scm/main.scm
Log:
Guile-side clean-up for --namespace option.
Also one bit of uncommitted code from gwrap change.
Modified: gnucash/trunk/src/app-utils/gw-app-utils-spec.scm
===================================================================
--- gnucash/trunk/src/app-utils/gw-app-utils-spec.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/app-utils/gw-app-utils-spec.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -395,8 +395,7 @@
'gnc:commodity-table-get-quotable-commodities-info
'(gw:glist-of <gnc:quote-info-scm> caller-owned)
"gnc_commodity_table_get_quotable_commodities"
- '((<gnc:commodity-table*> table)
- ((<gw:mchars> caller-owned const) namespace))
+ '((<gnc:commodity-table*> table))
"Return a list of all the quotable commodities in a given namespace in the table.")
Modified: gnucash/trunk/src/engine/gw-engine-spec.scm
===================================================================
--- gnucash/trunk/src/engine/gw-engine-spec.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/engine/gw-engine-spec.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -729,7 +729,7 @@
"xaccAccountFixSplitDateOrder"
'((<gnc:Account*> a) (<gnc:Split*> s))
"Check to see if split s is in proper sorted date order with respect
- to the other splits in account a.")
+to the other splits in account a.")
(gw:wrap-function
ws
Modified: gnucash/trunk/src/report/report-system/html-style-sheet.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-style-sheet.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/report/report-system/html-style-sheet.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -125,6 +125,9 @@
(define gnc:html-style-sheet-style
(record-accessor <html-style-sheet> 'style))
+(define gnc:current-saved-stylesheets
+ (gnc:build-dotgnucash-path "stylesheets-2.0"))
+
(define (gnc:save-style-sheet-options)
(let ((port (false-if-exception
(open gnc:current-saved-stylesheets
Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/report/report-system/report.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -397,6 +397,9 @@
(gnc:report-name report)
(gnc:report-type report))))
+(define gnc:current-saved-reports
+ (gnc:build-dotgnucash-path "saved-reports-2.0"))
+
(define (gnc:report-save-to-savefile report)
(let ((conf-file-name gnc:current-saved-reports))
;;(display conf-file-name)
Modified: gnucash/trunk/src/scm/command-line.scm
===================================================================
--- gnucash/trunk/src/scm/command-line.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/scm/command-line.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -27,7 +27,6 @@
(define gnc:*share-path* #f)
(define gnc:*doc-path* #f)
-(define gnc:*namespace-regexp* #f)
(define (gnc:expand-path new-list current-list default-generator)
(define (expand-path-item item)
@@ -76,13 +75,6 @@
eq?
#f))
- (set! gnc:*namespace-regexp*
- (gnc:make-config-var
- (N_ "Limit price quotes retrieved to commodities whose namespace matched this regexp.")
- (lambda (var value) (if (string? value) (list value) #f))
- eq?
- #f))
-
;; Convert the temporary startup value into a config var.
(let ((current-value gnc:*debugging?*))
(set!
@@ -212,6 +204,7 @@
(set! gnc:*batch-mode-things-to-do*
(cons
(lambda ()
+ (gnc:debug "Beginning to add price-quote")
(gnc:use-guile-module-here! '(gnucash price-quotes))
(gnc:suspend-gui-refresh)
(gnc:engine-suspend-events)
@@ -225,13 +218,6 @@
"FILE"
(N_ "Add price quotes to given FILE."))
- (list "namespace"
- 'string
- (lambda (val)
- (gnc:debug "parsing --namespace " val)
- (gnc:config-var-value-set! gnc:*namespace-regexp* #f val))
- #f
- (N_ "Regular expression determining which namespace commodities will be retrieved"))
))
Modified: gnucash/trunk/src/scm/main.scm
===================================================================
--- gnucash/trunk/src/scm/main.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/scm/main.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -29,6 +29,8 @@
(use-modules (srfi srfi-8))
(use-modules (gnucash gnc-module))
+;;(use-modules (gnucash price-quotes))
+
(use-modules (ice-9 slib))
(require 'printf)
@@ -60,15 +62,9 @@
(re-export hash-fold)
(re-export string-split)
-;; from path.scm
-(export gnc:current-config-auto)
-(export gnc:current-saved-reports)
-(export gnc:current-saved-stylesheets)
-
;; from command-line.scm
(export gnc:*share-path*)
(export gnc:*doc-path*)
-(export gnc:*namespace-regexp*)
;; from doc.scm
(export gnc:find-doc-file)
@@ -352,7 +348,6 @@
(gnc:setup-debugging)
;; Now we can load a bunch of files.
- (load-from-path "path.scm")
(load-from-path "command-line.scm") ;; depends on app-utils (N_, etc.)...
(gnc:initialize-config-vars) ;; in command-line.scm
Deleted: gnucash/trunk/src/scm/path.scm
===================================================================
--- gnucash/trunk/src/scm/path.scm 2006-01-21 03:50:25 UTC (rev 12911)
+++ gnucash/trunk/src/scm/path.scm 2006-01-21 03:59:22 UTC (rev 12912)
@@ -1,23 +0,0 @@
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of
-;; the License, or (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, contact:
-;;
-;; Free Software Foundation Voice: +1-617-542-5942
-;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
-;; Boston, MA 02110-1301, USA gnu at gnu.org
-
-(define gnc:current-saved-reports
- (gnc:build-dotgnucash-path "saved-reports-2.0"))
-
-(define gnc:current-saved-stylesheets
- (gnc:build-dotgnucash-path "stylesheets-2.0"))
-
More information about the gnucash-changes
mailing list