|
|
@@ -173,6 +173,7 @@ is replaced with replacement."
|
|
|
(push (cons :user-agent user-agent) headers)
|
|
|
(remf args :user-agent))
|
|
|
(remf args :parameters)
|
|
|
+ (remf args :headers)
|
|
|
(apply #'dex:request uri :headers headers args)))
|
|
|
|
|
|
;; XML processing
|
|
|
@@ -218,7 +219,11 @@ is replaced with replacement."
|
|
|
|
|
|
(defun select-text (selector node)
|
|
|
(ignore-errors
|
|
|
- (string-trim '(#\Newline #\Space #\Return) (plump:text (elt (clss:select selector node) 0)))))
|
|
|
+ (plump:text (plump:strip
|
|
|
+ (let ((node (elt (clss:select selector node) 0)))
|
|
|
+ (plump:traverse node #'(lambda (n) (setf (plump:text n) ""))
|
|
|
+ :test #'plump:comment-p)
|
|
|
+ node)))))
|
|
|
|
|
|
;; JSON processing
|
|
|
(defun json-request (url &rest args &key method parameters content headers basic-auth cookie-jar keep-alive use-connection-pool timeout ssl-key-file ssl-cert-file ssl-key-password stream verbose proxy insecure ca-path user-agent (object-as :alist))
|