r19283 - gnucash/trunk/src - After learning the scheme case syntax, implement it correctly this time.

[Christian Stimming]

Author: cstim
Date: 2010-06-21 15:45:22 -0400 (Mon, 21 Jun 2010)
New Revision: 19283
Trac: http://svn.gnucash.org/trac/changeset/19283

Modified:
   gnucash/trunk/src/app-utils/date-utilities.scm
   gnucash/trunk/src/report/standard-reports/account-piecharts.scm
Log:
After learning the scheme case syntax, implement it correctly this time.

Fixes r19281, r19280, r19253, r19252.

Modified: gnucash/trunk/src/app-utils/date-utilities.scm
===================================================================
--- gnucash/trunk/src/app-utils/date-utilities.scm	2010-06-21 15:55:51 UTC (rev 19282)
+++ gnucash/trunk/src/app-utils/date-utilities.scm	2010-06-21 19:45:22 UTC (rev 19283)
@@ -190,10 +190,10 @@
 ;; symbol was unknown
 (define (gnc:date-get-fraction-func interval)
   (case interval
-    ('YearDelta gnc:date-to-year-fraction)
-    ('MonthDelta gnc:date-to-month-fraction)
-    ('WeekDelta gnc:date-to-week-fraction)
-    ('DayDelta gnc:date-to-day-fraction)
+    ((YearDelta) gnc:date-to-year-fraction)
+    ((MonthDelta) gnc:date-to-month-fraction)
+    ((WeekDelta) gnc:date-to-week-fraction)
+    ((DayDelta) gnc:date-to-day-fraction)
     (else #f)))
 
 ;; Modify a date

Modified: gnucash/trunk/src/report/standard-reports/account-piecharts.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/account-piecharts.scm	2010-06-21 15:55:51 UTC (rev 19282)
+++ gnucash/trunk/src/report/standard-reports/account-piecharts.scm	2010-06-21 19:45:22 UTC (rev 19283)
@@ -108,7 +108,7 @@
 ;; Option deactivated before 2.4.0 is out in order not to have
 ;; untranslated strings show up for the user (string freeze). Will be
 ;; activated in 2.4.1 or so by un-commenting the line below and
-;; removing the line above, and changing line 217 and 262 and 280ff accordingly.
+;; removing the line above, and changing line 217 accordingly.
     ;;(if do-intervals?
         (add-option
          (gnc:make-multichoice-option
@@ -259,7 +259,7 @@
            (tree-depth (if (equal? account-levels 'all)
                            (gnc:get-current-account-tree-depth)
                            account-levels))
-           (averaging-fraction-func #f) ;;(gnc:date-get-fraction-func averaging-selection))
+           (averaging-fraction-func (gnc:date-get-fraction-func averaging-selection))
            (averaging-multiplier
             (if averaging-fraction-func
                 ;; Calculate the divisor of the amounts so that an
@@ -277,12 +277,12 @@
                 1))
            ;; If there is averaging, the report-title is extended
            ;; accordingly.
-;           (report-title
-;            (case averaging-selection
-;              ('YearDelta (string-append report-title " " (_ "Yearly Average")))
-;              ('MonthDelta (string-append report-title " " (_ "Monthly Average")))
-;              ('WeekDelta (string-append report-title " " (_ "Weekly Average")))
-;              (else report-title)))
+           (report-title
+            (case averaging-selection
+              ((YearDelta) (string-append report-title " " (_ "Yearly Average")))
+              ((MonthDelta) (string-append report-title " " (_ "Monthly Average")))
+              ((WeekDelta) (string-append report-title " " (_ "Weekly Average")))
+              (else report-title)))
            (combined '())
            (other-anchor "")
            (print-info (gnc-commodity-print-info report-currency #t)))