X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=datetime.lisp;h=b3dbc1a47f895895e549064059d876202c0b5a74;hb=12026eac09e773e83887a6073d5a034979ce7043;hp=8357da030b95b5e028d80711e072e6fb83cfdc30;hpb=22765cd49d01672b58873f98554c3b5f3069663f;p=kmrcl.git diff --git a/datetime.lisp b/datetime.lisp index 8357da0..b3dbc1a 100644 --- a/datetime.lisp +++ b/datetime.lisp @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; ;;;; KMRCL users are granted the rights to distribute and use this software @@ -26,31 +24,31 @@ (decode-universal-time (encode-universal-time s m hour day month year)) (values (elt '("Monday" "Tuesday" "Wednesday" "Thursday" - "Friday" "Saturday" "Sunday") - wkday) - (elt '("January" "February" "March" "April" "May" "June" - "July" "August" "September" "October" "November" - "December") - (1- mn)) - (format nil "~A" dy) + "Friday" "Saturday" "Sunday") + wkday) + (elt '("January" "February" "March" "April" "May" "June" + "July" "August" "September" "October" "November" + "December") + (1- mn)) + (format nil "~A" dy) (format nil "~A" yr) - (format nil "~2,'0D:~2,'0D:~2,'0D" hr min sec)))) + (format nil "~2,'0D:~2,'0D:~2,'0D" hr min sec)))) (defun pretty-date-ut (&optional (tm (get-universal-time))) (multiple-value-bind (sec min hr dy mn yr) (decode-universal-time tm) (pretty-date yr mn dy hr min sec))) -(defun date-string (ut) +(defun date-string (&optional (ut (get-universal-time))) (if (typep ut 'integer) (multiple-value-bind (sec min hr day mon year dow daylight-p zone) - (decode-universal-time ut) - (declare (ignore daylight-p zone)) - (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" - dow - day - (1- mon) - year - hr min sec)))) + (decode-universal-time ut) + (declare (ignore daylight-p zone)) + (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~] ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" + dow + day + (1- mon) + year + hr min sec)))) (defun print-seconds (secs) (print-float-units secs "sec")) @@ -112,7 +110,7 @@ (defun day-of-week (year month day) "Day of week calculation using Zeller's Congruence. -Input: The year y, month m (1 ≤ m ≤ 12) and day d (1 ≤ d ≤ 31). +Input: The year y, month m (1 <= m <= 12) and day d (1 <= d <= 31). Output: n - the day of the week (Sunday = 0, Saturday = 6)." (when (< month 3)