add ability to understand ISO8601 basic format as well as the extended one.
This commit is contained in:
Mark A. Hershberger
parent
4e021e652a
commit
b6377f1dc3
2 changed files with 90 additions and 77 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2009-08-14 Mark A. Hershberger <mah@everybody.org>
|
||||
|
||||
* timezone.el (timezone-parse-date): Add ability to understand ISO
|
||||
basic format (minimal separators) dates in addition to the
|
||||
already-supported extended format dates.
|
||||
|
||||
2009-08-14 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* international/ucs-normalize.el: Add a `coding' file variable.
|
||||
|
|
|
|||
161
lisp/timezone.el
161
lisp/timezone.el
|
|
@ -134,99 +134,106 @@ Understands the following styles:
|
|||
(6) Thu, 11 Apr 16:17:12 91 [MET]
|
||||
(7) Mon, 6 Jul 16:47:20 T 1992 [MET]
|
||||
(8) 1996-06-24 21:13:12 [GMT]
|
||||
(9) 1996-06-24 21:13-ZONE"
|
||||
;; Get rid of any text properties.
|
||||
(9) 1996-06-24 21:13-ZONE
|
||||
(10) 19960624T211312"
|
||||
;; Get rid of any text properties.
|
||||
(and (stringp date)
|
||||
(or (text-properties-at 0 date)
|
||||
(next-property-change 0 date))
|
||||
(next-property-change 0 date))
|
||||
(setq date (copy-sequence date))
|
||||
(set-text-properties 0 (length date) nil date))
|
||||
(let ((date (or date ""))
|
||||
(year nil)
|
||||
(month nil)
|
||||
(day nil)
|
||||
(time nil)
|
||||
(zone nil)) ;This may be nil.
|
||||
(year nil)
|
||||
(month nil)
|
||||
(day nil)
|
||||
(time nil)
|
||||
(zone nil)) ;This may be nil.
|
||||
(cond ((string-match
|
||||
"\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (1) and (2) with timezone and buggy timezone
|
||||
;; This is most common in mail and news,
|
||||
;; so it is worth trying first.
|
||||
(setq year 3 month 2 day 1 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\'" date)
|
||||
;; Styles: (1) and (2) without timezone
|
||||
(setq year 3 month 2 day 1 time 4 zone nil))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\'" date)
|
||||
;; Styles: (6) and (7) without timezone
|
||||
(setq year 6 month 3 day 2 time 4 zone nil))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (6) and (7) with timezone and buggy timezone
|
||||
(setq year 6 month 3 day 2 time 4 zone 7))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([0-9]+\\)" date)
|
||||
;; Styles: (3) without timezone
|
||||
(setq year 4 month 1 day 2 time 3 zone nil))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)[ \t]+\\([0-9]+\\)" date)
|
||||
;; Styles: (3) with timezone
|
||||
(setq year 5 month 1 day 2 time 3 zone 4))
|
||||
((string-match
|
||||
"\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (4) with timezone
|
||||
(setq year 3 month 2 day 1 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([A-Za-z]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)\\(\\.[0-9]+\\)?[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (5) with timezone.
|
||||
(setq year 3 month 2 day 1 time 4 zone 6))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([A-Za-z]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)\\(\\.[0-9]+\\)?" date)
|
||||
;; Styles: (5) without timezone.
|
||||
(setq year 3 month 2 day 1 time 4 zone nil))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (8) with timezone.
|
||||
(setq year 1 month 2 day 3 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[T \t]+\\([0-9]+:[0-9]+\\)[ \t]+\\([-+a-zA-Z0-9:]+\\)" date)
|
||||
;; Styles: (8) with timezone with a colon in it.
|
||||
(setq year 1 month 2 day 3 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[T \t]+\\([0-9]+:[0-9]+:[0-9]+\\)" date)
|
||||
;; Styles: (8) without timezone.
|
||||
(setq year 1 month 2 day 3 time 4 zone nil))
|
||||
)
|
||||
"\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (1) and (2) with timezone and buggy timezone
|
||||
;; This is most common in mail and news,
|
||||
;; so it is worth trying first.
|
||||
(setq year 3 month 2 day 1 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\'" date)
|
||||
;; Styles: (1) and (2) without timezone
|
||||
(setq year 3 month 2 day 1 time 4 zone nil))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\'" date)
|
||||
;; Styles: (6) and (7) without timezone
|
||||
(setq year 6 month 3 day 2 time 4 zone nil))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (6) and (7) with timezone and buggy timezone
|
||||
(setq year 6 month 3 day 2 time 4 zone 7))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([0-9]+\\)" date)
|
||||
;; Styles: (3) without timezone
|
||||
(setq year 4 month 1 day 2 time 3 zone nil))
|
||||
((string-match
|
||||
"\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)[ \t]+\\([0-9]+\\)" date)
|
||||
;; Styles: (3) with timezone
|
||||
(setq year 5 month 1 day 2 time 3 zone 4))
|
||||
((string-match
|
||||
"\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (4) with timezone
|
||||
(setq year 3 month 2 day 1 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([A-Za-z]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)\\(\\.[0-9]+\\)?[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (5) with timezone.
|
||||
(setq year 3 month 2 day 1 time 4 zone 6))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([A-Za-z]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)\\(\\.[0-9]+\\)?" date)
|
||||
;; Styles: (5) without timezone.
|
||||
(setq year 3 month 2 day 1 time 4 zone nil))
|
||||
((string-match
|
||||
"\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
|
||||
;; Styles: (8) with timezone.
|
||||
(setq year 1 month 2 day 3 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]\\{4\\}\\)-?\\([0-9]\\{0,2\\}\\)-?\\([0-9]\\{0,2\\}\\)[T \t]+\\([0-9]\\{0,2\\}:?[0-9]\\{0,2\\}:?[0-9]\\{0,2\\}\\)[ \t]*\\([-+a-zA-Z]+[0-9:]*\\)" date)
|
||||
;; Styles: (8) with timezone with a colon in it.
|
||||
(setq year 1 month 2 day 3 time 4 zone 5))
|
||||
((string-match
|
||||
"\\([0-9]\\{4\\}\\)-?\\([0-9]\\{0,2\\}\\)-?\\([0-9]\\{0,2\\}\\)[T \t]+\\([0-9]+:?[0-9]+:?[0-9]+\\)" date)
|
||||
;; Styles: (8) without timezone.
|
||||
(setq year 1 month 2 day 3 time 4 zone nil))
|
||||
)
|
||||
|
||||
(when year
|
||||
(setq year (match-string year date))
|
||||
;; Guess ambiguous years. Assume years < 69 don't predate the
|
||||
;; Unix Epoch, so are 2000+. Three-digit years are assumed to
|
||||
;; be relative to 1900.
|
||||
(if (< (length year) 4)
|
||||
(let ((y (string-to-number year)))
|
||||
(if (< y 69)
|
||||
(setq y (+ y 100)))
|
||||
(setq year (int-to-string (+ 1900 y)))))
|
||||
(when (< (length year) 4)
|
||||
(let ((y (string-to-number year)))
|
||||
(when (< y 69)
|
||||
(setq y (+ y 100)))
|
||||
(setq year (int-to-string (+ 1900 y)))))
|
||||
(setq month
|
||||
(if (= (aref date (+ (match-beginning month) 2)) ?-)
|
||||
;; Handle numeric months, spanning exactly two digits.
|
||||
(substring date
|
||||
(match-beginning month)
|
||||
(+ (match-beginning month) 2))
|
||||
(let* ((string (substring date
|
||||
(match-beginning month)
|
||||
(+ (match-beginning month) 3)))
|
||||
(monthnum
|
||||
(cdr (assoc (upcase string) timezone-months-assoc))))
|
||||
(if monthnum
|
||||
(int-to-string monthnum)))))
|
||||
(if (or (= (aref date (+ (match-beginning month) 2)) ?-)
|
||||
(let ((n (string-to-number
|
||||
(char-to-string
|
||||
(aref date (+ (match-beginning month) 2))))))
|
||||
(= (aref (number-to-string n) 0)
|
||||
(aref date (+ (match-beginning month) 2)))))
|
||||
;; Handle numeric months, spanning exactly two digits.
|
||||
(substring date
|
||||
(match-beginning month)
|
||||
(+ (match-beginning month) 2))
|
||||
(let* ((string (substring date
|
||||
(match-beginning month)
|
||||
(+ (match-beginning month) 3)))
|
||||
(monthnum
|
||||
(cdr (assoc (upcase string) timezone-months-assoc))))
|
||||
(when monthnum
|
||||
(int-to-string monthnum)))))
|
||||
(setq day (match-string day date))
|
||||
(setq time (match-string time date)))
|
||||
(if zone (setq zone (match-string zone date)))
|
||||
(when zone (setq zone (match-string zone date)))
|
||||
;; Return a vector.
|
||||
(if (and year month)
|
||||
(vector year month day time zone)
|
||||
(vector year month day time zone)
|
||||
(vector "0" "0" "0" "0" nil))))
|
||||
|
||||
(defun timezone-parse-time (time)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue