diff options
| author | Sean Allred <code@seanallred.com> | 2015-01-04 14:07:40 -0500 |
|---|---|---|
| committer | Sean Allred <code@seanallred.com> | 2015-01-04 14:07:40 -0500 |
| commit | 01df71244d3fe5412e2420127dcd2282d9fa39c7 (patch) | |
| tree | 0fe936bfa609ea19c454cdcb4d1c2349d5c0c746 /sx-method.el | |
| parent | 59327f6f9c6ba419543c47670a62af0aa41271ca (diff) | |
| parent | 89834aa61adf1fff29379c82ab96629f0b2960d0 (diff) | |
Merge branch 'master' into filter-macro
Conflicts:
sx-filter.el
Diffstat (limited to 'sx-method.el')
| -rw-r--r-- | sx-method.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sx-method.el b/sx-method.el index e0764fb..e68a4ea 100644 --- a/sx-method.el +++ b/sx-method.el @@ -60,6 +60,9 @@ authentication. :PAGE is the page number which will be requested :PAGESIZE is the number of items to retrieve per request, default 100 +Any conflicting information in :KEYWORDS overrides the :PAGE +and :PAGESIZE settings. + When AUTH is nil, it is assumed that no auth-requiring filters or methods will be used. If they are an error will be signaled. This is to ensure awareness of where auth is needed. @@ -127,8 +130,10 @@ Return the entire response as a complex alist." (error "This request requires authentication.")))) ;; Concatenate all parameters now that filter is ensured. (push `(filter . ,(sx-filter-get-var filter)) keywords) - (push `(page . ,page) keywords) - (push `(pagesize . ,pagesize) keywords) + (unless (assq 'page keywords) + (push `(page . ,page) keywords)) + (unless (assq 'pagesize keywords) + (push `(pagesize . ,pagesize) keywords)) (when site (push `(site . ,site) keywords)) (funcall call |