From b584889b9d7578de1330e6fc2e2355b25f9a2d30 Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Mon, 26 Jun 2000 05:48:10 +0000 Subject: [PATCH] Merge from 1.4. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2513 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/scm/date-utilities.scm | 20 ++++---------------- src/scm/report/transaction-report.scm | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/scm/date-utilities.scm b/src/scm/date-utilities.scm index 25526b6512..42ed3247cb 100644 --- a/src/scm/date-utilities.scm +++ b/src/scm/date-utilities.scm @@ -150,6 +150,9 @@ ((= (car t1) (car t2)) (<= (cdr t2) (cdr t2))) (else #f))) +(define (gnc:timepair-eq t1 t2) + (and (= (car t1) (car t2)) (= (cdr t1) (cdr t2)))) + ;; Build a list of time intervals (define (dateloop curd endd incr) (cond ((gnc:timepair-later curd endd) @@ -225,28 +228,13 @@ ;; converts it to be midday that day. (define (gnc:timepair-canonical-day-time tp) - (let ((bdt (localtime (car tp)))) + (let ((bdt (localtime (gnc:timepair->secs tp)))) (set-tm:sec bdt 0) (set-tm:min bdt 0) (set-tm:hour bdt 12) (let ((newtime (car (mktime bdt)))) - ; alert - blarsen@ada-works.com fixed this. you may want to - ; revert if I'm wrong. (cons newtime 0)))) -(define (gnc:timepair-earlier-or-eq-date t1 t2) - (let ((time1 (car (gnc:timepair-canonical-day-time t1))) - (time2 (car (gnc:timepair-canonical-day-time t2)))) - (<= time1 time2))) - -(define (gnc:timepair-later-date t1 t2) - (let ((time1 (car (gnc:timepair-canonical-day-time t1))) - (time2 (car (gnc:timepair-canonical-day-time t2)))) - (< time1 time2))) - -(define (gnc:timepair-later-or-eq-date t1 t2) - (gnc:timepair-earlier-or-eq-date t2 t1)) - (define (gnc:timepair-start-day-time tp) (let ((bdt (localtime (gnc:timepair->secs tp)))) (set-tm:sec bdt 0) diff --git a/src/scm/report/transaction-report.scm b/src/scm/report/transaction-report.scm index 9efb41eda2..5b36555b3e 100644 --- a/src/scm/report/transaction-report.scm +++ b/src/scm/report/transaction-report.scm @@ -294,7 +294,7 @@ (if ascending? (lambda (a b) (< (car a) (car b))) (lambda (a b) (> (car a) (car b)))) - (lambda (a b) (and (= (car a) (car b)) (= (cadr a) (cadr b)))) + (lambda (a b) (and (= (car a) (car b)) (= (cdr a) (cdr b)))) #f #f))