mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
REMOVE-TIMEPAIR: libgnucash/app-utils/app-utils.scm & date-utilities.scm
This commit removes timepair API functions defined in date-utilities.scm
This commit is contained in:
Christopher Lam
parent
9fd53e6869
commit
ee8f9053e8
@ -180,11 +180,6 @@
|
||||
;; date-utilities.scm
|
||||
|
||||
(export gnc:reldate-list)
|
||||
(export gnc:timepair->secs)
|
||||
(export gnc:secs->timepair)
|
||||
(export gnc:timepair->date)
|
||||
(export gnc:date->timepair)
|
||||
(export gnc:timepair?)
|
||||
(export gnc:date-get-year)
|
||||
(export gnc:date-get-quarter)
|
||||
(export gnc:date-get-month-day)
|
||||
@ -192,13 +187,6 @@
|
||||
(export gnc:date-get-week-day)
|
||||
(export gnc:date-get-week)
|
||||
(export gnc:date-get-year-day)
|
||||
(export gnc:timepair-get-year)
|
||||
(export gnc:timepair-get-quarter)
|
||||
(export gnc:timepair-get-month-day)
|
||||
(export gnc:timepair-get-month)
|
||||
(export gnc:timepair-get-week-day)
|
||||
(export gnc:timepair-get-week)
|
||||
(export gnc:timepair-get-year-day)
|
||||
(export gnc:time64-get-year)
|
||||
(export gnc:time64-get-quarter)
|
||||
(export gnc:time64-get-month-day)
|
||||
@ -227,18 +215,6 @@
|
||||
(export incdate)
|
||||
(export decdate64)
|
||||
(export incdate64)
|
||||
(export gnc:timepair-later)
|
||||
(export gnc:timepair-lt)
|
||||
(export gnc:timepair-earlier)
|
||||
(export gnc:timepair-gt)
|
||||
(export gnc:timepair-le)
|
||||
(export gnc:timepair-ge)
|
||||
(export gnc:timepair-eq)
|
||||
(export gnc:timepair-earlier-date)
|
||||
(export gnc:timepair-later-date)
|
||||
(export gnc:timepair-le-date)
|
||||
(export gnc:timepair-ge-date)
|
||||
(export gnc:timepair-eq-date)
|
||||
(export gnc:time64-le-date)
|
||||
(export gnc:time64-ge-date)
|
||||
(export gnc:make-date-interval-list)
|
||||
@ -255,12 +231,6 @@
|
||||
(export ThirtyDayDelta)
|
||||
(export NinetyDayDelta)
|
||||
(export gnc:deltasym-to-delta)
|
||||
(export gnc:timepair-delta)
|
||||
(export gnc:time-elapsed)
|
||||
(export gnc:timepair-start-day-time)
|
||||
(export gnc:timepair-end-day-time)
|
||||
(export gnc:timepair-previous-day)
|
||||
(export gnc:timepair-next-day)
|
||||
(export gnc:time64-start-day-time)
|
||||
(export gnc:time64-end-day-time)
|
||||
(export gnc:time64-previous-day)
|
||||
|
||||
@ -27,29 +27,6 @@
|
||||
|
||||
(define gnc:reldate-list '())
|
||||
|
||||
(define (gnc:timepair->secs tp)
|
||||
(gnc:warn "deprecated timepair->secs, use time64 directly")
|
||||
(inexact->exact
|
||||
(+ (car tp)
|
||||
(/ (cdr tp) 1000000000))))
|
||||
|
||||
(define (gnc:secs->timepair secs)
|
||||
(gnc:warn "deprecated secs->timepair, use time64 direclty")
|
||||
(cons secs 0))
|
||||
|
||||
(define (gnc:timepair->date tp)
|
||||
(gnc:warn "deprecated timepair->date, use gnc-localtime")
|
||||
(gnc-localtime (gnc:timepair->secs tp)))
|
||||
|
||||
(define (gnc:date->timepair date)
|
||||
(gnc:warn "deprecated timepair->date, use gnc-mktime")
|
||||
(gnc:secs->timepair (gnc-mktime date)))
|
||||
|
||||
(define (gnc:timepair? date)
|
||||
(gnc:warn "deprecated timepair?")
|
||||
(and (number? (car date))
|
||||
(number? (cdr date))))
|
||||
|
||||
;; get stuff from localtime date vector
|
||||
(define (gnc:date-get-year datevec)
|
||||
(+ 1900 (tm:year datevec)))
|
||||
@ -70,34 +47,6 @@
|
||||
(define (gnc:date-get-year-day datevec)
|
||||
(+ (tm:yday datevec) 1))
|
||||
|
||||
(define (gnc:timepair-get-year tp)
|
||||
(gnc:warn "deprecated timepair-get-year")
|
||||
(gnc:date-get-year (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:timepair-get-quarter tp)
|
||||
(gnc:warn "deprecated timepair-get-quarter")
|
||||
(gnc:date-get-quarter (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:timepair-get-month-day tp)
|
||||
(gnc:warn "deprecated timepair-get-month-day")
|
||||
(gnc:date-get-month-day (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:timepair-get-month tp)
|
||||
(gnc:warn "deprecated timepair-get-month")
|
||||
(gnc:date-get-month (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:timepair-get-week-day tp)
|
||||
(gnc:warn "deprecated timepair-get-week-day")
|
||||
(gnc:date-get-week-day (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:timepair-get-week tp)
|
||||
(gnc:warn "deprecated timepair-get-week")
|
||||
(gnc:date-get-week (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:timepair-get-year-day tp)
|
||||
(gnc:warn "deprecated timepair-get-year-day")
|
||||
(gnc:date-get-year-day (gnc:timepair->date tp)))
|
||||
|
||||
(define (gnc:time64-get-year t64)
|
||||
(gnc:date-get-year (gnc-localtime t64)))
|
||||
|
||||
@ -254,19 +203,6 @@
|
||||
(else #f)))
|
||||
|
||||
;; Modify a date
|
||||
(define (moddate op adate delta)
|
||||
(gnc:warn "deprecated moddate. use moddate64 instead.")
|
||||
(let ((newtm (gnc:timepair->date adate)))
|
||||
(begin
|
||||
(set-tm:sec newtm (op (tm:sec newtm) (tm:sec delta)))
|
||||
(set-tm:min newtm (op (tm:min newtm) (tm:min delta)))
|
||||
(set-tm:hour newtm (op (tm:hour newtm) (tm:hour delta)))
|
||||
(set-tm:mday newtm (op (tm:mday newtm) (tm:mday delta)))
|
||||
(set-tm:mon newtm (op (tm:mon newtm) (tm:mon delta)))
|
||||
(set-tm:year newtm (op (tm:year newtm) (tm:year delta)))
|
||||
(set-tm:isdst newtm 0)
|
||||
(gnc:date->timepair newtm))))
|
||||
|
||||
(define (moddate64 op adate delta)
|
||||
(let ((newtm (gnc-localtime adate)))
|
||||
(begin
|
||||
@ -280,71 +216,11 @@
|
||||
(gnc-mktime newtm))))
|
||||
|
||||
;; Add or subtract time from a date
|
||||
(define (decdate adate delta)(moddate - adate delta ))
|
||||
(define (incdate adate delta)(moddate + adate delta ))
|
||||
|
||||
(define (decdate64 adate delta) (moddate64 - adate delta ))
|
||||
(define (incdate64 adate delta) (moddate64 + adate delta ))
|
||||
|
||||
;; Time comparison, true if t2 is later than t1
|
||||
;; FIXME: RENAME THIS FUNCTION!!!!
|
||||
;; NOTE ALL THESE FUNCTIONS WILL BECOME OBSOLETE SOON
|
||||
|
||||
(define (gnc:timepair-later t1 t2)
|
||||
(gnc:warn "deprecated timepair-later")
|
||||
(cond ((< (car t1) (car t2)) #t)
|
||||
((= (car t1) (car t2)) (< (cdr t2) (cdr t2)))
|
||||
(else #f)))
|
||||
|
||||
(define (gnc:timepair-lt t1 t2)
|
||||
(gnc:warn "deprecated timepair-lt")
|
||||
(gnc:timepair-later t1 t2))
|
||||
|
||||
(define (gnc:timepair-earlier t1 t2)
|
||||
(gnc:warn "deprecated timepair-earlier")
|
||||
(gnc:timepair-later t2 t1))
|
||||
|
||||
(define (gnc:timepair-gt t1 t2)
|
||||
(gnc:warn "deprecated timepair-gt")
|
||||
(gnc:timepair-earlier t1 t2))
|
||||
|
||||
;; t1 <= t2
|
||||
(define (gnc:timepair-le t1 t2)
|
||||
(gnc:warn "deprecated timepair-le")
|
||||
(cond ((< (car t1) (car t2)) #t)
|
||||
((= (car t1) (car t2)) (<= (cdr t2) (cdr t2)))
|
||||
(else #f)))
|
||||
|
||||
(define (gnc:timepair-ge t1 t2)
|
||||
(gnc:warn "deprecated timepair-ge")
|
||||
(gnc:timepair-le t2 t1))
|
||||
|
||||
(define (gnc:timepair-eq t1 t2)
|
||||
(gnc:warn "deprecated timepair-eq")
|
||||
(and (= (car t1) (car t2)) (= (cdr t1) (cdr t2))))
|
||||
|
||||
;; date-granularity comparison functions.
|
||||
|
||||
(define (gnc:timepair-earlier-date t1 t2)
|
||||
(gnc:timepair-earlier (timespecCanonicalDayTime t1)
|
||||
(timespecCanonicalDayTime t2)))
|
||||
|
||||
(define (gnc:timepair-later-date t1 t2)
|
||||
(gnc:timepair-earlier-date t2 t1))
|
||||
|
||||
(define (gnc:timepair-le-date t1 t2)
|
||||
(gnc:warn "deprecated gnc:timepair-le-date. use gnc:time64-le-date")
|
||||
(gnc:timepair-le (timespecCanonicalDayTime t1)
|
||||
(timespecCanonicalDayTime t2)))
|
||||
|
||||
(define (gnc:timepair-ge-date t1 t2)
|
||||
(gnc:warn "deprecated timepair-ge-date")
|
||||
(gnc:timepair-le t2 t1))
|
||||
|
||||
(define (gnc:timepair-eq-date t1 t2)
|
||||
(gnc:timepair-eq (timespecCanonicalDayTime t1)
|
||||
(timespecCanonicalDayTime t2)))
|
||||
|
||||
(define (gnc:time64-le-date t1 t2)
|
||||
(<= (time64CanonicalDayTime t1)
|
||||
(time64CanonicalDayTime t2)))
|
||||
@ -357,16 +233,6 @@
|
||||
;; Note that the last interval will be shorter than <incr> if
|
||||
;; (<curd>-<endd>) is not an integer multiple of <incr>. If you don't
|
||||
;; want that you'll have to write another function.
|
||||
(define (gnc:make-datepair-interval-list curd endd incr)
|
||||
(gnc:warn "deprecated gnc:make-date-interval-list")
|
||||
(cond ((gnc:timepair-later curd endd)
|
||||
(let ((nextd (incdate curd incr)))
|
||||
(cond ((gnc:timepair-later nextd endd)
|
||||
(cons (list curd (decdate nextd SecDelta) '())
|
||||
(gnc:make-date-interval-list nextd endd incr)))
|
||||
(else (cons (list curd endd '()) '())))))
|
||||
(else '())))
|
||||
|
||||
(define (gnc:make-date-interval-list current-date end-date increment)
|
||||
(if (< current-date end-date)
|
||||
(let ((next-date (incdate64 current-date increment)))
|
||||
@ -382,14 +248,6 @@
|
||||
;; not an integer multiple of 'incr', 'enddate' will be added as the
|
||||
;; last element of the list, thus making the last interval smaller
|
||||
;; than 'incr'.
|
||||
(define (gnc:make-datepair-list startdate enddate incr)
|
||||
(gnc:warn "deprecated gnc:make-date-list")
|
||||
(cond ((gnc:timepair-later startdate enddate)
|
||||
(cons startdate
|
||||
(gnc:make-date-list (incdate startdate incr)
|
||||
enddate incr)))
|
||||
(else (list enddate))))
|
||||
|
||||
(define (gnc:make-date-list startdate enddate incr)
|
||||
(if (< startdate enddate)
|
||||
(cons startdate
|
||||
@ -485,53 +343,9 @@
|
||||
(cdr retval)
|
||||
#f)))
|
||||
|
||||
;; Find difference in seconds time 1 and time2
|
||||
(define (gnc:timepair-delta t1 t2)
|
||||
(gnc:warn "(gnc:timepair-delta) obsolete. use (-) directly")
|
||||
(- (gnc:timepair->secs t2) (gnc:timepair->secs t1)))
|
||||
|
||||
;; find float difference between times
|
||||
(define (gnc:time-elapsed t1 t2)
|
||||
(+ (- (car t2)
|
||||
(car t1))
|
||||
(/ (- (cdr t2)
|
||||
(cdr t1)) 1000000.0)))
|
||||
|
||||
;; timepair manipulation functions
|
||||
;; hack alert - these should probably be put somewhere else
|
||||
;; and be implemented PROPERLY rather than hackily
|
||||
;;; Added from transaction-report.scm
|
||||
|
||||
;; given a timepair contains any time on a certain day (local time)
|
||||
;; given a time64 time on a certain day (local time)
|
||||
;; converts it to be midday that day.
|
||||
|
||||
(define (gnc:timepair-start-day-time tp)
|
||||
(gnc:warn "(gnc:timepair-start-day-time) obsolete")
|
||||
(let ((bdt (gnc:timepair->date tp)))
|
||||
(set-tm:sec bdt 0)
|
||||
(set-tm:min bdt 0)
|
||||
(set-tm:hour bdt 0)
|
||||
(set-tm:isdst bdt -1)
|
||||
(gnc:date->timepair bdt)))
|
||||
|
||||
(define (gnc:timepair-end-day-time tp)
|
||||
(gnc:warn "(gnc:timepair-end-day-time) obsolete")
|
||||
(let ((bdt (gnc:timepair->date tp)))
|
||||
(set-tm:sec bdt 59)
|
||||
(set-tm:min bdt 59)
|
||||
(set-tm:hour bdt 23)
|
||||
(set-tm:isdst bdt -1)
|
||||
(gnc:date->timepair bdt)))
|
||||
|
||||
(define (gnc:timepair-previous-day tp)
|
||||
(gnc:warn "gnc:timepair-previous-day obsolete")
|
||||
(decdate tp DayDelta))
|
||||
|
||||
(define (gnc:timepair-next-day tp)
|
||||
(gnc:warn "gnc:timepair-next-day obsolete")
|
||||
(incdate tp DayDelta))
|
||||
|
||||
;; new time64 helper functions
|
||||
(define (gnc:time64-start-day-time t64)
|
||||
(let ((bdt (gnc-localtime t64)))
|
||||
(set-tm:sec bdt 0)
|
||||
@ -866,7 +680,7 @@
|
||||
(if (> month-days (tm:mday now))
|
||||
(set-tm:mday now month-days))
|
||||
(set-tm:isdst now -1)
|
||||
(gnc:date->timepair now))))
|
||||
(gnc-mktime now))))
|
||||
|
||||
(define (gnc:get-one-year-ago)
|
||||
(let ((now (gnc-localtime (current-time))))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user