X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=datetime.lisp;h=30c815c9d01d5bf482e084c5c6ee6ed8b9c0dd7d;hp=8357da030b95b5e028d80711e072e6fb83cfdc30;hb=1142016daa209cb657b035c651641a94ef49892a;hpb=22765cd49d01672b58873f98554c3b5f3069663f diff --git a/datetime.lisp b/datetime.lisp index 8357da0..30c815c 100644 --- a/datetime.lisp +++ b/datetime.lisp @@ -26,31 +26,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"))