X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Ftime.lisp;h=0bb18c340b45aad6aaaec43ab4cc3172739b397c;hp=75f3faafbc9cebef9af607acfa4fa3e35be30333;hb=HEAD;hpb=fd2493718d0e1114fcbe3dd578dab658ea383e81

diff --git a/sql/time.lisp b/sql/time.lisp
index 75f3faa..0bb18c3 100644
--- a/sql/time.lisp
+++ b/sql/time.lisp
@@ -1,8 +1,6 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; A variety of structures and function for creating and
 ;;;; manipulating dates, times, durations and intervals for
 ;;;; CLSQL.
@@ -85,11 +83,11 @@
   (declare (ignore depth))
   (if *print-escape*
       (format stream "#<DURATION: ~a>"
-	      (format-duration nil duration :precision :second))
+              (format-duration nil duration :precision :second))
       (format-duration stream duration :precision :second)))
 
 (defstruct (date (:constructor %make-date)
-		 (:print-function %print-date))
+                 (:print-function %print-date))
   (mjd 0 :type fixnum))
 
 (defun %print-date (date stream depth)
@@ -104,8 +102,10 @@
   (let ((second (duration-second duration))
         (minute (duration-minute duration))
         (hour (duration-hour duration))
-        (day (duration-day duration)))
-    (format nil "P~dD~dH~dM~dS" day hour minute second)))
+        (day (duration-day duration))
+        (month (duration-month duration))
+        (year (duration-year duration)))
+    (format nil "P~dY~dM~dD~dH~dM~dS" year month day hour minute second)))
 
 
 ;; ------------------------------------------------------------
@@ -124,7 +124,7 @@
 (defun make-date (&key (year 0) (month 1) (day 1) (hour 0) (minute 0)
                        (second 0) (usec 0) (offset 0))
   (time->date (make-time :year year :month month :day day :hour hour
-			 :minute minute :second second :usec usec :offset offset)))
+                         :minute minute :second second :usec usec :offset offset)))
 
 (defun copy-time (time)
   (%make-wall-time :mjd (time-mjd time)
@@ -230,15 +230,15 @@
         (* (duration-reduce duration :hour) 60)))
     (:hour
      (+ (if round
-	    (floor (duration-minute duration) 30)
-	    0)
-	(duration-hour duration)
-	(* (duration-reduce duration :day) 24)))
+            (floor (duration-minute duration) 30)
+            0)
+        (duration-hour duration)
+        (* (duration-reduce duration :day) 24)))
     (:day
      (+ (if round
-	    (floor (duration-hour duration) 12)
-	    0)
-	(duration-day duration)))))
+            (floor (duration-hour duration) 12)
+            0)
+        (duration-day duration)))))
 
 
 ;; ------------------------------------------------------------
@@ -307,19 +307,19 @@
 (defun time/= (number &rest more-numbers)
   "Returns T if no two of its arguments are numerically equal, NIL otherwise."
   (do* ((head number (car nlist))
-	(nlist more-numbers (cdr nlist)))
+        (nlist more-numbers (cdr nlist)))
        ((atom nlist) t)
      (declare (list nlist))
      (unless (do* ((nl nlist (cdr nl)))
-		  ((atom nl) t)
-	       (declare (list nl))
-	       (if (%time= head (car nl)) (return nil)))
+                  ((atom nl) t)
+               (declare (list nl))
+               (if (%time= head (car nl)) (return nil)))
        (return nil))))
 
 (defun time< (number &rest more-numbers)
   "Returns T if its arguments are in strictly increasing order, NIL otherwise."
   (do* ((n number (car nlist))
-	(nlist more-numbers (cdr nlist)))
+        (nlist more-numbers (cdr nlist)))
        ((atom nlist) t)
      (declare (list nlist))
      (if (not (%time< n (car nlist))) (return nil))))
@@ -327,7 +327,7 @@
 (defun time> (number &rest more-numbers)
   "Returns T if its arguments are in strictly decreasing order, NIL otherwise."
   (do* ((n number (car nlist))
-	(nlist more-numbers (cdr nlist)))
+        (nlist more-numbers (cdr nlist)))
        ((atom nlist) t)
      (declare (list nlist))
      (if (not (%time> n (car nlist))) (return nil))))
@@ -335,7 +335,7 @@
 (defun time<= (number &rest more-numbers)
   "Returns T if arguments are in strictly non-decreasing order, NIL otherwise."
   (do* ((n number (car nlist))
-	(nlist more-numbers (cdr nlist)))
+        (nlist more-numbers (cdr nlist)))
        ((atom nlist) t)
      (declare (list nlist))
      (if (not (%time<= n (car nlist))) (return nil))))
@@ -343,7 +343,7 @@
 (defun time>= (number &rest more-numbers)
   "Returns T if arguments are in strictly non-increasing order, NIL otherwise."
   (do* ((n number (car nlist))
-	(nlist more-numbers (cdr nlist)))
+        (nlist more-numbers (cdr nlist)))
        ((atom nlist) t)
      (declare (list nlist))
      (if (not (%time>= n (car nlist))) (return nil))))
@@ -390,26 +390,28 @@
 (defun replace-string (string1 search-string replace-string &key (test #'string=))
   "Search within string1 for search-string, replace with replace-string, non-destructively."
   (let ((replace-string-length (length replace-string))
-	(search-string-length  (length search-string)))
+        (search-string-length  (length search-string)))
     (labels ((sub-replace-string (current-string position)
-	       (let ((found-position (search search-string current-string :test test :start2 position)))
-		 (if (null found-position)
-		     current-string
-		     (sub-replace-string (concatenate 'string
-						      (subseq current-string 0 found-position)
-						      replace-string
-						      (subseq current-string (+ found-position search-string-length)))
-					 (+ position replace-string-length))))))
+               (let ((found-position (search search-string current-string :test test :start2 position)))
+                 (if (null found-position)
+                     current-string
+                     (sub-replace-string (concatenate 'string
+                                                      (subseq current-string 0 found-position)
+                                                      replace-string
+                                                      (subseq current-string (+ found-position search-string-length)))
+                                         (+ position replace-string-length))))))
       (sub-replace-string string1 0))))
 );eval-when
 
 (defmacro wrap-time-for-date (time-func &key (result-func))
-  (let ((date-func (intern (replace-string (symbol-name time-func) "TIME" "DATE"))))
+  (let ((date-func (intern (replace-string (symbol-name time-func)
+                                           (symbol-name-default-case "TIME")
+                                           (symbol-name-default-case "DATE")))))
     `(defun ,date-func (number &rest more-numbers)
       (let ((result (apply #',time-func (mapcar #'date->time (cons number more-numbers)))))
-	,(if result-func
-	     `(funcall #',result-func result)
-	     'result)))))
+        ,(if result-func
+             `(funcall #',result-func result)
+             'result)))))
 
 (wrap-time-for-date time=)
 (wrap-time-for-date time/=)
@@ -425,58 +427,51 @@
 
 ;; ------------------------------------------------------------
 ;; Formatting and output
-
-(defvar +decimal-printer+ #(#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9))
-
-(defun db-timestring (time)
-  "return the string to store the given time in the database"
-  (declare (optimize (speed 3)))
-  (let ((output (copy-seq "'XXXX-XX-XX XX:XX:XX.")))
-    (flet ((inscribe-base-10 (output offset size decimal)
-             (declare (type fixnum offset size decimal)
-                      (type (simple-vector 10) +decimal-printer+))
-             (dotimes (x size)
-               (declare (type fixnum x)
-                        (optimize (safety 0)))
-               (multiple-value-bind (next this)
-                   (floor decimal 10)
-                 (setf (aref output (+ (- size x 1) offset))
-                       (aref +decimal-printer+ this))
-                 (setf decimal next)))))
-      (multiple-value-bind (usec second minute hour day month year)
-          (decode-time time)
-        (inscribe-base-10 output 1 4 year)
-        (inscribe-base-10 output 6 2 month)
-        (inscribe-base-10 output 9 2 day)
-        (inscribe-base-10 output 12 2 hour)
-        (inscribe-base-10 output 15 2 minute)
-        (inscribe-base-10 output 18 2 second)
-        (format nil "~a~d'" output usec)))))
-
-(defun iso-timestring (time)
+(defun db-timestring (time &key stream)
   "return the string to store the given time in the database"
-  (declare (optimize (speed 3)))
-  (let ((output (copy-seq "XXXX-XX-XX XX:XX:XX,")))
-    (flet ((inscribe-base-10 (output offset size decimal)
-             (declare (type fixnum offset size decimal)
-                      (type (simple-vector 10) +decimal-printer+))
-             (dotimes (x size)
-               (declare (type fixnum x)
-                        (optimize (safety 0)))
-               (multiple-value-bind (next this)
-                   (floor decimal 10)
-                 (setf (aref output (+ (- size x 1) offset))
-                       (aref +decimal-printer+ this))
-                 (setf decimal next)))))
-      (multiple-value-bind (usec second minute hour day month year)
-          (decode-time time)
-        (inscribe-base-10 output 0 4 year)
-        (inscribe-base-10 output 5 2 month)
-        (inscribe-base-10 output 8 2 day)
-        (inscribe-base-10 output 11 2 hour)
-        (inscribe-base-10 output 14 2 minute)
-        (inscribe-base-10 output 17 2 second)
-        (format nil "~a,~d" output usec)))))
+  (if stream
+      (progn (write-char #\' stream) (iso-timestring time :stream stream) (write-char #\' stream))
+      (concatenate 'string "'" (iso-timestring time) "'")))
+
+(defun iso-timestring (time &key stream)
+  (multiple-value-bind (usec sec min hour day month year dow)
+      (decode-time time)
+    (declare (ignore dow))
+    (flet ((fmt (stream)
+	     (when (< year 1000) (princ #\0 stream))
+	     (when (< year 100) (princ #\0 stream))
+	     (when (< year 10) (princ #\0 stream))
+	     (princ year stream)
+	     (princ #\- stream)
+	     (when (< month 10) (princ #\0 stream))
+	     (princ month stream)
+	     (princ #\- stream)
+	     (when (< day 10) (princ #\0 stream))
+	     (princ day stream)
+	     (princ #\T stream) ;strict ISO says T here isn't optional.
+	     (when (< hour 10) (princ #\0 stream))
+	     (princ hour stream)
+	     (princ #\: stream)
+	     (when (< min 10) (princ #\0 stream))
+	     (princ min stream)
+	     (princ #\: stream)
+	     (when (< sec 10) (princ #\0 stream))
+	     (princ sec stream)
+	     (when (and usec (plusp usec))
+	       ;; we dont do this because different dbs support differnt precision levels
+	       (princ #\. stream)
+	       (loop for i from 5 downto 0
+		     for x10 = (expt 10 i)
+		     do (multiple-value-bind (quo rem)
+			    (floor (/ usec x10))
+			  (setf usec (- usec (* quo x10)))
+			  (princ quo stream)
+			  (when (= rem 0) (return)))))
+	     nil))
+      (if stream
+	  (fmt stream)
+	  (with-output-to-string (stream)
+	    (fmt stream))))))
 
 (defun db-datestring (date)
   (db-timestring (date->time date)))
@@ -537,9 +532,9 @@
 
 (defun sort-interval-list (list)
   (sort list (lambda (x y)
-	       (case (interval-relation x y)
-		 ((:precedes :contains) t)
-		 ((:follows :overlaps :contained) nil)))))
+               (case (interval-relation x y)
+                 ((:precedes :contains) t)
+                 ((:follows :overlaps :contained) nil)))))
 
 ;; interval push will return its list of intervals in strict order.
 (defun interval-push (interval-list interval &optional container-rule)
@@ -547,19 +542,19 @@
   (let ((sorted-list (sort-interval-list interval-list)))
     (dotimes (x (length sorted-list))
       (let ((elt (nth x sorted-list)))
-	(case (interval-relation elt interval)
-	  (:follows
-	   (return-from interval-push (insert-at-index x sorted-list interval)))
-	  (:contains
-	   (return-from interval-push
-	     (replace-at-index x sorted-list
-			       (make-interval :start (interval-start elt)
-					      :end (interval-end elt)
-					      :type (interval-type elt)
-					      :contained (interval-push (interval-contained elt) interval)
-					      :data (interval-data elt)))))
-	  ((:overlaps :contained)
-	   (error "Overlap")))))
+        (case (interval-relation elt interval)
+          (:follows
+           (return-from interval-push (insert-at-index x sorted-list interval)))
+          (:contains
+           (return-from interval-push
+             (replace-at-index x sorted-list
+                               (make-interval :start (interval-start elt)
+                                              :end (interval-end elt)
+                                              :type (interval-type elt)
+                                              :contained (interval-push (interval-contained elt) interval)
+                                              :data (interval-data elt)))))
+          ((:overlaps :contained)
+           (error "Overlap")))))
     (append sorted-list (list interval))))
 
 ;; interval lists
@@ -570,9 +565,9 @@
   (let ((list (sort-interval-list list)))
     (dotimes (x (length list))
       (let ((elt (nth x list)))
-	(when (and (time<= (interval-start elt) time)
-		   (time< time (interval-end elt)))
-	  (return-from interval-match x))))))
+        (when (and (time<= (interval-start elt) time)
+                   (time< time (interval-end elt)))
+          (return-from interval-match x))))))
 
 (defun interval-clear (list time)
   (dotimes (x (length list))
@@ -582,7 +577,7 @@
         (if (interval-match (interval-contained elt) time)
             (return-from interval-clear
               (replace-at-index x list
-				(make-interval :start (interval-start elt)
+                                (make-interval :start (interval-start elt)
                                                :end (interval-end elt)
                                                :type (interval-type elt)
                                                :contained (interval-clear (interval-contained elt) time)
@@ -597,24 +592,24 @@ begins at time.  If no changes are made, returns nil."
   (let ((list (sort-interval-list list)))
     (if (null list) nil
       (dotimes (x (length list))
-	(let ((elt (nth x list)))
-	  (when (and (time<= (interval-start elt) time)
-		     (time< time (interval-end elt)))
-	    (or (interval-edit (interval-contained elt) time start end tag)
-		(cond ((and (< 0 x)
-			    (time< start (interval-end (nth (1- x) list))))
-		       (error "Overlap of previous interval"))
-		      ((and (< x (1- (length list)))
-			    (time< (interval-start (nth (1+ x) list)) end))
-		       (error "~S ~S ~S ~S Overlap of next interval" x (length list) (interval-start (nth (1+ x) list)) end ))
-		      ((time= (interval-start elt) time)
-		       (return-from interval-edit
-			 (replace-at-index x list
-					   (make-interval :start start
-							  :end end
-							  :type (interval-type elt)
-							  :contained (restrict-intervals (interval-contained elt) start end)
-							  :data (or tag (interval-data elt))))))))))))))
+        (let ((elt (nth x list)))
+          (when (and (time<= (interval-start elt) time)
+                     (time< time (interval-end elt)))
+            (or (interval-edit (interval-contained elt) time start end tag)
+                (cond ((and (< 0 x)
+                            (time< start (interval-end (nth (1- x) list))))
+                       (error "Overlap of previous interval"))
+                      ((and (< x (1- (length list)))
+                            (time< (interval-start (nth (1+ x) list)) end))
+                       (error "~S ~S ~S ~S Overlap of next interval" x (length list) (interval-start (nth (1+ x) list)) end ))
+                      ((time= (interval-start elt) time)
+                       (return-from interval-edit
+                         (replace-at-index x list
+                                           (make-interval :start start
+                                                          :end end
+                                                          :type (interval-type elt)
+                                                          :contained (restrict-intervals (interval-contained elt) start end)
+                                                          :data (or tag (interval-data elt))))))))))))))
 
 (defun restrict-intervals (list start end &aux newlist)
   (let ((test-interval (make-interval :start start :end end)))
@@ -793,18 +788,18 @@ TIME2."
 
   (let (day-diff sec-diff)
     (setf day-diff (- (time-mjd time2)
-		      (time-mjd time1)))
+                      (time-mjd time1)))
     (if (> day-diff 0)
-	(progn (decf day-diff)
-	       (setf sec-diff (+ (time-second time2)
-				 (- (* 60 60 24)
-				    (time-second time1)))))
+        (progn (decf day-diff)
+               (setf sec-diff (+ (time-second time2)
+                                 (- (* 60 60 24)
+                                    (time-second time1)))))
       (setf sec-diff (- (time-second time2)
-			(time-second time1))))
+                        (time-second time1))))
      (make-duration :day day-diff
                    :second sec-diff))))
     (if (time< time1 time2)
-	(do-diff time1 time2)
+        (do-diff time1 time2)
       (do-diff time2 time1))))
 
 (defun date-difference (date1 date2)
@@ -813,14 +808,14 @@ TIME2."
   (time-difference (date->time date1) (date->time date2)))
 
 (defun format-date (stream date &key format
-		    (date-separator "-")
-		    (internal-separator " "))
+                    (date-separator "-")
+                    (internal-separator " "))
   "produces on stream the datestring corresponding to the date
 with the given options"
   (format-time stream (date->time date)
-	       :format format
-	       :date-separator date-separator
-	       :internal-separator internal-separator))
+               :format format
+               :date-separator date-separator
+               :internal-separator internal-separator))
 
 (defun format-time (stream time &key format
                     (date-separator "-")
@@ -830,29 +825,25 @@ with the given options"
 with the given options"
   (let ((*print-circle* nil))
     (multiple-value-bind (usec second minute hour day month year dow)
-	(decode-time time)
+        (decode-time time)
       (case format
-	(:pretty
-	 (format stream "~A ~A, ~A ~D, ~D"
-		 (pretty-time hour minute)
-		 (day-name dow)
-		 (month-name month)
-		 day
-		 year))
-	(:short-pretty
-	 (format stream "~A, ~D/~D/~D"
-		 (pretty-time hour minute)
-		 month day year))
-	(:iso
-	 (let ((string (iso-timestring time)))
-	   (if stream
-	       (write-string string stream)
-             string)))
-	(t
-	 (format stream "~2,'0D~A~2,'0D~A~2,'0D~A~2,'0D~A~2,'0D~A~2,'0D.~6,'0D"
-		 year date-separator month date-separator day
-		 internal-separator hour time-separator minute time-separator
-		 second usec))))))
+        (:pretty
+	   (format stream "~A ~A, ~A ~D, ~D"
+		   (pretty-time hour minute)
+		   (day-name dow)
+		   (month-name month)
+		   day
+		   year))
+        (:short-pretty
+	   (format stream "~A, ~D/~D/~D"
+		   (pretty-time hour minute)
+		   month day year))
+        ((:iso :iso8601) (iso-timestring time :stream stream))
+        (t (format stream "~2,'0D~A~2,'0D~A~2,'0D~A~2,'0D~A~2,'0D~A~2,'0D.~6,'0D"
+		   year date-separator month date-separator day
+		   internal-separator hour time-separator minute time-separator
+		   second usec)
+	   )))))
 
 (defun pretty-time (hour minute)
   (cond
@@ -878,10 +869,10 @@ with the given options"
   (third (mjd-to-gregorian (time-mjd (get-time)))))
 
 (defun current-month ()
-  (second (mjd-to-gregorian (time-mjd (get-time)))))
+  (first (mjd-to-gregorian (time-mjd (get-time)))))
 
 (defun current-day ()
-  (first (mjd-to-gregorian (time-mjd (get-time)))))
+  (second (mjd-to-gregorian (time-mjd (get-time)))))
 
 (defun parse-date-time (string)
   "parses date like 08/08/01, 8.8.2001, eg"
@@ -1002,6 +993,8 @@ with the given options"
         (minute (duration-minute duration))
         (hour (duration-hour duration))
         (day (duration-day duration))
+        (month (duration-month duration))
+        (year (duration-year duration))
         (return (null stream))
         (stream (or stream (make-string-output-stream))))
     (ecase precision
@@ -1013,10 +1006,20 @@ with the given options"
        (setf second 0))
       (:second
        t))
-    (if (= 0 day hour minute)
+    (if (= 0 year month day hour minute)
         (format stream "0 minutes")
         (let ((sent? nil))
+          (when (< 0 year)
+            (format stream "~d year~p" year year)
+            (setf sent? t))
+          (when (< 0 month)
+            (when sent?
+              (write-char #\Space stream))
+            (format stream "~d month~p" month month)
+            (setf sent? t))
           (when (< 0 day)
+            (when sent?
+              (write-char #\Space stream))
             (format stream "~d day~p" day day)
             (setf sent? t))
           (when (< 0 hour)
@@ -1046,16 +1049,20 @@ with the given options"
   (unless (= 0 year month)
     (multiple-value-bind (year-orig month-orig day-orig)
         (time-ymd date)
-      (setf date (make-time :year (+ year year-orig)
-                            :month (+ month month-orig)
-                            :day day-orig
-                            :second (time-second date)
-                            :usec usec))))
+      (multiple-value-bind (new-year new-month)
+         (floor (+ month month-orig (* 12 (+ year year-orig))) 12)
+       (let ((new-date (make-time :year new-year
+                                  :month new-month
+                                  :day day-orig
+                                  :second (time-second date)
+                                  :usec usec)))
+         (if destructive
+             (setf (time-mjd date) (time-mjd new-date))
+             (setq date new-date))))))
   (let ((mjd (time-mjd date))
-        (sec (time-second date))
-        (usec (time-usec date)))
+        (sec (time-second date)))
     (multiple-value-bind (sec-new usec-new)
-        (floor (+ usec
+        (floor (+ usec (time-usec date)
                   (* 1000000
                      (+ sec second
                         (* 60 minute)
@@ -1139,7 +1146,7 @@ rules"
 
 (defun parse-yearstring (string)
   (let ((year (or (parse-integer-insensitively string)
-		  (extract-roman string))))
+                  (extract-roman string))))
     (when (and year (< 1500 year 2500))
       (make-time :year year))))
 
@@ -1175,63 +1182,97 @@ rules"
     :initarg :bad-component
     :reader bad-component))
   (:report (lambda (c stream)
-	     (format stream "Bad component: ~A " (bad-component c)))))
+             (format stream "Bad component: ~A " (bad-component c)))))
 
 (defun parse-timestring (timestring &key (start 0) end junk-allowed)
   "parse a timestring and return the corresponding wall-time.  If the
 timestring starts with P, read a duration; otherwise read an ISO 8601
 formatted date string."
   (declare (ignore junk-allowed))
-  (let ((string (subseq timestring start end)))
-    (if (char= (aref string 0) #\P)
-	(parse-iso-8601-duration string)
-      (parse-iso-8601-time string))))
+  (etypecase timestring
+    (wall-time timestring)
+    (date (date->time timestring))
+    (string
+     (let ((string (subseq timestring start end)))
+       (if (char= (aref string 0) #\P)
+           (parse-iso-8601-duration string)
+           (parse-iso-8601-time string))))))
 
 (defun parse-datestring (datestring &key (start 0) end junk-allowed)
   "parse a ISO 8601 timestring and return the corresponding date.
 Will throw a hissy fit if the date string is a duration. Will ignore any precision beyond day (hour/min/sec/usec)."
-  (let ((parsed-value (parse-timestring datestring :start start :end end :junk-allowed junk-allowed)))
-    (ecase (type-of parsed-value)
-      (wall-time (%make-date :mjd (time-mjd parsed-value))))))
+  (etypecase datestring
+    (date datestring)
+    (wall-time (time->date datestring))
+    (string
+     (let ((parsed-value
+             (parse-timestring
+              datestring :start start :end end :junk-allowed junk-allowed)))
+       (etypecase parsed-value
+         (date parsed-value)
+         (wall-time (time->date parsed-value)))))))
 
 
 (defvar *iso-8601-duration-delimiters*
-  '((#\D . :days)
+  '((#\Y . :years)
+    (#\D . :days)
     (#\H . :hours)
-    (#\M . :minutes)
+    (#\M . :months/minutes)
     (#\S . :seconds)))
 
 (defun iso-8601-delimiter (elt)
   (cdr (assoc elt *iso-8601-duration-delimiters*)))
 
-(defun iso-8601-duration-subseq (string start)
-  (let* ((pos (position-if #'iso-8601-delimiter string :start start))
-	 (number (when pos (parse-integer (subseq string start pos)
-                                          :junk-allowed t))))
+(defun iso-8601-duration-subseq (string end)
+  (let* ((pos (position-if #'iso-8601-delimiter string :end end :from-end t))
+         (pos2 (when pos
+                 (position-if-not #'digit-char-p string :end pos :from-end t)))
+         (number (when pos2
+                   (parse-integer
+                    (subseq string (1+ pos2) pos) :junk-allowed t))))
     (when number
       (values number
-	      (1+ pos)
-	      (iso-8601-delimiter (aref string pos))))))
+              (1+ pos)
+              (1+ pos2)
+              (iso-8601-delimiter (aref string pos))))))
 
 (defun parse-iso-8601-duration (string)
   "return a wall-time from a duration string"
   (block parse
-    (let ((days 0) (secs 0) (hours 0) (minutes 0) (index 1))
+    (let ((years 0)
+          (months 0)
+          (days 0)
+          (secs 0)
+          (hours 0)
+          (minutes 0)
+          (index (length string))
+          (months/minutes nil))
       (loop
-       (multiple-value-bind (duration next-index duration-type)
+       (multiple-value-bind (duration end next-index duration-type)
            (iso-8601-duration-subseq string index)
+         (declare (ignore end))
          (case duration-type
+           (:years
+            (incf years duration))
+           (:months/minutes
+            (if months/minutes
+                (incf months duration)
+                (progn
+                  (setq months/minutes t)
+                  (incf minutes duration))))
+           (:days
+            (setq months/minutes t)
+            (incf days duration))
            (:hours
+            (setq months/minutes t)
             (incf hours duration))
-           (:minutes
-            (incf minutes duration))
            (:seconds
             (incf secs duration))
-           (:days
-            (incf days duration))
            (t
-            (return-from parse (make-duration :day days :hour hours
-                                              :minute minutes :second secs))))
+            (return-from parse
+              (make-duration
+               :year years :month months :day days :hour hours
+               :minute minutes :second secs))))
          (setf index next-index))))))
 
 ;; e.g. 2000-11-11 00:00:00-06
@@ -1270,20 +1311,22 @@ Will throw a hissy fit if the date string is a duration. Will ignore any precisi
                                    0))
           (cond
             ((and (> strlen 19)
-		  (or (char= #\, (char string 19))
-		      (char= #\. (char string 19))))
+                  (or (char= #\, (char string 19))
+                      (char= #\. (char string 19))))
              (multiple-value-bind (parsed-usec usec-end)
                  (parse-integer string :start 20 :junk-allowed t)
-               (setf usec          (or parsed-usec 0)
-                     gmt-sec-offset (if (<= (+ 3 usec-end)  strlen)
-                                        (let ((skip-to (or (position #\+ string :start 19)
-                                                           (position #\- string :start 19))))
-                                          (if skip-to
-                                              (* 60 60
-                                                 (parse-integer string :start skip-to
-                                                                :end (+ skip-to 3)))
-                                              0))
-                                        0))))
+               (let ((parsed-usec (and parsed-usec
+				       (floor (* parsed-usec (expt 10 (+ 6 (- usec-end) 20)))))))
+		 (setf usec          (or parsed-usec 0)
+		       gmt-sec-offset (if (<= (+ 3 usec-end)  strlen)
+					  (let ((skip-to (or (position #\+ string :start 19)
+							     (position #\- string :start 19))))
+					    (if skip-to
+						(* 60 60
+						   (parse-integer string :start skip-to
+								  :end (+ skip-to 3)))
+						0))
+					  0)))))
             (t
              (setf usec           0
                    gmt-sec-offset (if (<= 22  strlen)
@@ -1312,5 +1355,5 @@ Will throw a hissy fit if the date string is a duration. Will ignore any precisi
                              `((year . ,year) (month . ,month)
                                (day . ,day) (hour . ,hour)
                                (minute . ,minute) (second . ,second)
-			       (usec . ,usec)
+                               (usec . ,usec)
                                (timezone . ,gmt-sec-offset)))))))))