remove eval usage from reports to make guile 1.6 compatibility easier.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5436 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,13 @@
+2001-09-28  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/app-utils/date-utilities.scm ((gnc:deltasym-to-delta)): new function
+	to convert datedelta symbols to the actual deltas.
+
+	* src/app-utils/app-utils.scm: export gnc:deltasym-to-delta
+
+	* src/report/standard-reports/net-barchart.scm (etc.): replace eval usage
+	with gnc:deltasym-to-delta
+
 2001-09-21  Robert Graham Merkel  <rgmerk@mira.net>
 
 	* src/engine/SchedXaction.c: fix split account bugs.

src/app-utils/app-utils.scm

@@ -167,6 +167,7 @@
 (export YearDelta )
 (export ThirtyDayDelta)
 (export NinetyDayDelta)
+(export gnc:deltasym-to-delta)
 (export gnc:timepair-delta)
 (export gnc:time-elapsed)
 (export gnc:timepair-start-day-time)

src/app-utils/date-utilities.scm

@@ -294,6 +294,25 @@
     (set-tm:mday ddt 90)
     ddt))
 
+;; if you add any more FooDeltas, add to this list!!!
+
+(define deltalist
+  (list (cons 'SecDelta SecDelta)
+	(cons 'DayDelta DayDelta)
+	(cons 'WeejDelta WeekDelta)
+	(cons 'MonthDelta MonthDelta)
+	(cons 'QuarterDelta QuarterDelta)
+	(cons 'HalfYearDelta HalfYearDelta)
+	(cons 'YearDelta YearDelta)
+	(cons 'ThirtyDayDelta ThirtyDayDelta)
+	(cons 'NinetyDayDelta NinetyDayDelta)))
+
+(define (gnc:deltasym-to-delta ds)
+  (let ((retval (assq ds deltalist)))
+    (if (pair? retval)
+	(cdr retval)
+	#f)))
+
 ;; Find difference in seconds time 1 and time2
 (define (gnc:timepair-delta t1 t2)
   (- (gnc:timepair->secs t2) (gnc:timepair->secs t1)))

src/report/standard-reports/average-balance.scm

@@ -268,7 +268,7 @@
          (enddate (gnc:timepair-end-day-time 
                    (gnc:date-option-absolute-time 
                     (get-option gnc:pagename-general optname-to-date))))
-         (stepsize (eval (get-option gnc:pagename-general optname-stepsize)))
+         (stepsize (gnc:deltasym-to-delta (get-option gnc:pagename-general optname-stepsize)))
          (report-currency (get-option gnc:pagename-general 
                                       optname-report-currency))
          (price-source (get-option gnc:pagename-general

src/report/standard-reports/category-barchart.scm

@@ -224,11 +224,11 @@ developing over time"))
                                (gnc:make-date-interval-list
                                 (gnc:timepair-start-day-time from-date-tp) 
                                 (gnc:timepair-end-day-time to-date-tp)
-                                (eval interval))
+                                (gnc:deltasym-to-delta interval))
                                (gnc:make-date-list
                                 (gnc:timepair-end-day-time from-date-tp) 
                                 (gnc:timepair-end-day-time to-date-tp)
-                                (eval interval))))
+                                (gnc:deltasym-to-delta interval))))
                ;; Here the date strings for the x-axis labels are
                ;; created.
                (date-string-list

src/report/standard-reports/net-barchart.scm

@@ -176,7 +176,7 @@
                       ((if inc-exp? gnc:timepair-start-day-time 
                            gnc:timepair-end-day-time) from-date-tp) 
                       (gnc:timepair-end-day-time to-date-tp)
-                      (eval interval)))
+                      (gnc:deltasym-to-delta interval)))
          (report-title (if inc-exp? (_ "Income/Expense Chart") 
                            (_ "Net Worth Chart")))
          (classified-accounts (gnc:decompose-accountlist accounts))