1 files changed, 58 insertions, 9 deletions
diff --git a/emacs/.emacs.d/lisp/my/my-org.el b/emacs/.emacs.d/lisp/my/my-org.el
index 5d7203f..e628c5b 100644
--- a/emacs/.emacs.d/lisp/my/my-org.el
+++ b/emacs/.emacs.d/lisp/my/my-org.el
@@ -1155,21 +1155,47 @@ On success, also move everything from staging to to-dir."
   (require 'org-recoll)
   "Format recoll results in buffer."
   ;; Format results in org format and tidy up
-  (org-recoll-regexp-replace-in-buffer
-   "^.*?\\[\\(.*?\\)\\]\\s-*\\[\\(.*?\\)\\]\\(.*\\)$"
-   "* [[\\1][\\2]] <\\1>\\3")
-  (org-recoll-regexp-replace-in-buffer
-   (format "<file://.*?%s\\(.*/\\).*>" (substring my-docs-root-dir 1))
-   "(\\1)")
+  (org-recoll-regexp-replace-in-buffer "file://" "file:")
+  (goto-char (point-min))
+  (delete-trailing-whitespace)
+  (while (re-search-forward
+          "^.*?\\[\\(.*?\\)\\]\\s-*\\[\\(.*?\\)\\]\\(.*\\)$" nil t)
+    (let ((file-name (match-string 1))
+          (title (match-string 2))
+          (size (match-string 3)))
+      (replace-match
+       (format "* %s (%s)%s"
+               (org-link-make-string file-name title)
+               (file-name-nondirectory file-name)
+               size)
+       t
+       t)))
   (org-recoll-regexp-replace-in-buffer "\\/ABSTRACT" "")
   (org-recoll-regexp-replace-in-buffer "ABSTRACT" "")
   ;; Justify results
   (goto-char (point-min))
   (org-recoll-fill-region-paragraphs)
   ;; Add emphasis
-  (highlight-phrase (org-recoll-reformat-for-file-search
-                     org-recoll-search-query)
-                    'bold-italic))
+  (let ((search-whitespace-regexp "[ 	]+"))
+    (highlight-phrase (org-recoll-reformat-for-file-search
+                       org-recoll-search-query)
+                      'bold-italic)))
+
+(defun my-org-recoll-query (query)
+  ;; caddr contains number of results
+  (seq-map
+   (lambda (line)
+     (pcase-let ((`(,title ,filename ,ipath ,abstract)
+                  (seq-map 'base64-decode-string (split-string line " "))))
+       `((title . ,title)
+         (filename . ,filename)
+         (ipath . ,ipath)
+         (abstract . ,abstract))))
+   (cdddr
+    (string-lines
+     (my-call-process-out
+      "recollq" "-F" "title filename ipath abstract" "-n" "0-40" "-q" query))))
+  )
 
 (defun my-org-recoll-mdn (query)
   (interactive "sSearch mdn: ")
@@ -1636,5 +1662,28 @@ dual relation link-back on that task."
   (and (org-entry-get (point) "BLOCKED_BY")
        (member (org-entry-get nil "TODO") org-not-done-keywords)))
 
+(defun my-org-clock-split ()
+  "Split the clock entry at the current line."
+  (interactive)
+  (let ((line (buffer-substring (line-beginning-position) (line-end-position))))
+    (unless (string-match org-element-clock-line-re line)
+      (error "Not at an org clock line"))
+    (let* ((start (match-string 1 line))
+           (end (match-string 2 line))
+           (mid (org-read-date t 'to-time nil "Split org clock at: " nil start)))
+      (back-to-indentation)
+      (kill-line)
+      (insert "CLOCK: [" start "]--")
+      (org-insert-time-stamp mid t t)
+      (org-clock-update-time-maybe)
+
+      (my-new-line-above-or-below)
+      (insert "CLOCK: ")
+      (org-insert-time-stamp mid t t)
+      (insert "--[" end "]")
+      (org-clock-update-time-maybe)
+      ))
+  )
+
 (provide 'my-org)
 ;;; my-org.el ends here