From b681793c76fd157da77feba6c7e6a666a29a50b9 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 7 Jul 2011 01:39:59 +0200
Subject: org/devonthink links

---
 org/jao-org-links.el |  8 ++++++++
 sys/jao-devon.el     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/org/jao-org-links.el b/org/jao-org-links.el
index 4ee4137..1ce7ab3 100644
--- a/org/jao-org-links.el
+++ b/org/jao-org-links.el
@@ -1,4 +1,5 @@
 (require 'jao-org-utils)
+(require 'jao-devon)
 
 (autoload 'jao-as-safari-doc "jao-applescript.el")
 
@@ -18,6 +19,13 @@
         (shell-command (format "mv %s %s" real-file dest-path))))
     (browse-url (format "file://%s" (expand-file-name  dest-path)))))
 
+;; devon links
+(org-add-link-type "x-devonthink-item" 'jao-devon-open 'identity)
+
+(defun jao-org-insert-devon-link ()
+  (interactive)
+  (insert (jao-devon-selection)))
+
 (defsubst jao-org--title->file (title)
   (concat (mapconcat 'downcase (split-string title nil t) "-") ".pdf"))
 
diff --git a/sys/jao-devon.el b/sys/jao-devon.el
index b9a5e69..4d454ba 100644
--- a/sys/jao-devon.el
+++ b/sys/jao-devon.el
@@ -20,23 +20,23 @@
  (concat "set rs to the selection
   set r to item 1 of rs
   set rn to the name of r
-  set rl to the location of r
+  set rl to the reference URL of r
   set ru to the URL of r
-  rl & rn & \"" *jao-devon-sep* "\" & ru"))
+  \"[[\" & rl & \"" *jao-devon-sep*
+  "\" & ru & \"][\" & rn & \"]]\""))
 
 (defun jao-devon-selection ()
-  (interactive)
   (jao-as-tell-app "DEVONThink Pro" *jao-devon-sel-as*))
 
-(defun jao-devon-open-as (path)
-  (concat "set r to get record at \"" path "\""
-          "\n open window for record r\n activate"))
+;; (defun jao-devon-open-as (path)
+;;   (concat "set r to get record at \"" path "\""
+;;           "\n open window for record r\n activate"))
 
 (defun jao-devon-open (dvp)
   (if (eq system-type 'darwin)
-      (let ((path (jao-devon-path dvp)))
-        (when path
-          (jao-as-tell-app "DEVONThink Pro" (jao-devon-open-as path))))
+      (let* ((path (jao-devon-path dvp))
+             (cmd (and path (format "open x-devonthink-item:%s" path))))
+        (when cmd (shell-command-to-string cmd)))
     (browse-url (jao-devon-url dvp))))
 
 (defun jao-devon-add-html-page (title url html)
-- 
cgit v1.2.3