emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Ryo TAKAISHI <ryo.takaishi.0@gmail.com>
To: emacs-orgmode@gnu.org
Cc: Ryo TAKAISHI <ryo.takaishi.0@gmail.com>
Subject: [PATCH] org-protocol: Pass optional value using query in url to capture from protocol.
Date: Mon, 31 Dec 2012 10:23:56 +0900	[thread overview]
Message-ID: <1356917036-31179-1-git-send-email-ryo.takaishi.0@gmail.com> (raw)

* lisp/org-protocol.el: (org-protocol-convert-query-to-plist): New function.
(org-protocol-do-capture): Use new function.

When org-protocol's url has query, org-capture get query using plist-get from store-link.
For example:
Url is "org-protocol:/capture:/URL/TITLE/BODY?key=value"
org-capture can get (:key value) with (plist-get org-store-link-plist :query).

---
 lisp/org-protocol.el |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 31f6fb2..2fa7c76 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -273,7 +273,7 @@ string with two characters."
   :group 'org-protocol
   :type 'string)
 
-(defcustom org-protocol-data-separator "/+"
+(defcustom org-protocol-data-separator "/+\\|\\?"
   "The default data separator to use.
    This should be a single regexp string."
   :group 'org-protocol
@@ -297,7 +297,7 @@ nil, assume \"/+\".  The results of that splitting are returned
 as a list.  If UNHEXIFY is non-nil, hex-decode each split part.
 If UNHEXIFY is a function, use that function to decode each split
 part."
-  (let* ((sep (or separator "/+"))
+  (let* ((sep (or separator "/+\\|\\?"))
          (split-parts (split-string data sep)))
     (if unhexify
 	(if (fboundp unhexify)
@@ -436,6 +436,14 @@ Now template ?b will be used."
       (message "Item captured."))
   nil)
 
+(defun org-protocol-convert-query-to-plist (query)
+  "Convert query string that is part of url to property list."
+  (if query
+      (apply 'append (mapcar (lambda (x)
+			       (let ((c (split-string x "=")))
+				 (list (intern (concat ":" (car c))) (cadr c))))
+			     (split-string query "&")))))
+
 (defun org-protocol-do-capture (info capture-func)
   "Support `org-capture' and `org-remember' alike.
 CAPTURE-FUNC is either the symbol `org-remember' or `org-capture'."
@@ -449,6 +457,7 @@ CAPTURE-FUNC is either the symbol `org-remember' or `org-capture'."
 	 (region (or (caddr parts) ""))
 	 (orglink (org-make-link-string
 		   url (if (string-match "[^[:space:]]" title) title url)))
+	 (query (or (org-protocol-convert-query-to-plist (cadddr parts)) ""))
 	 (org-capture-link-is-already-stored t) ;; avoid call to org-store-link
 	 remember-annotation-functions)
     (setq org-stored-links
@@ -458,7 +467,8 @@ CAPTURE-FUNC is either the symbol `org-remember' or `org-capture'."
 			  :link url
 			  :description title
 			  :annotation orglink
-			  :initial region)
+			  :initial region
+			  :query query)
     (raise-frame)
     (funcall capture-func nil template)))
 
-- 
1.7.9.6 (Apple Git-31.1)

next             reply	other threads:[~2012-12-31  1:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-31  1:23 Ryo TAKAISHI [this message]
2012-12-31 10:11 ` [PATCH] org-protocol: Pass optional value using query in url to capture from protocol Bastien
2013-01-01  9:10   ` Ryo TAKAISHI
2013-03-03  1:06   ` Ryo Takaishi
2013-03-04  0:13   ` Ryo TAKAISHI
2013-03-04  0:16     ` Bastien

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:31f6fb2 dfblob:2fa7c76
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1356917036-31179-1-git-send-email-ryo.takaishi.0@gmail.com \
    --to=ryo.takaishi.0@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).