[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] oc-basic.el: Better handling of CSL-JSON dates
From: |
David Lukes |
Subject: |
[PATCH] oc-basic.el: Better handling of CSL-JSON dates |
Date: |
Fri, 25 Feb 2022 14:21:44 +0100 |
* lisp/oc-basic.el (org-cite-basic--parse-json): Make date-parsing and
year extraction more resilient. Provide more informative errors when it
fails.
A string-based date is not only indicated by the key 'raw, but also
possibly by the key 'literal.
String-based dates come in various formats, not necessarily yyyy-mm-dd.
So extracting the first sequence of 4 digits is arguably a better
heuristic for getting the publication year than splitting the string on
- and getting the car of that.
On error, include `value' in the message, which contains the original
value with actionable information, whereas the previously included
`date' is always nil in that case.
TINYCHANGE
---
lisp/oc-basic.el | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index d82406aff..81b7e4471 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -178,21 +178,29 @@ Return a hash table with citation references as keys and
fields alist as values.
" and ")))
('issued
;; Date are expressed as an array
- ;; (`date-parts') or a "string (`raw').
- ;; In both cases, extract the year and
- ;; associate it to `year' field, for
- ;; compatibility with BibTeX format.
+ ;; (`date-parts') or a "string (`raw'
+ ;; or `literal'). In both cases,
+ ;; extract the year and associate it
+ ;; to `year' field, for compatibility
+ ;; with BibTeX format.
(let ((date (or (alist-get 'date-parts value)
+ (alist-get 'literal value)
(alist-get 'raw value))))
(cons 'year
(cond
((consp date)
(caar date))
((stringp date)
- (car (split-string date "-")))
+ (replace-regexp-in-string
+ (rx
+ (minimal-match (zero-or-more
anything))
+ (group-n 1 (repeat 4 digit))
+ (zero-or-more anything))
+ (rx (backref 1))
+ date))
(t
(error "Unknown CSL-JSON date format:
%S"
- date))))))
+ value))))))
(_
(cons field value))))
item)
--
2.34.1
- [PATCH] oc-basic.el: Better handling of CSL-JSON dates,
David Lukes <=