mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00
Code

babel: better handling of table in shell scripts

Browse Source
This commit is contained in:
Eric Schulte 2010-02-07 10:17:20 -07:00
parent 047ac8ab1b
commit a60a83fbb6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/babel/lisp/langs/org-babel-sh.el
View File

@ -48,12 +48,13 @@ function is called by `org-babel-execute-src-block'."
(session (org-babel-sh-initiate-session (first processed-params)))
(vars (second processed-params))
(result-type (fourth processed-params))
(sep (cdr (assoc :separator params)))
(full-body (concat
(mapconcat ;; define any variables
(lambda (pair)
(format "%s=%s"
(car pair)
(org-babel-sh-var-to-sh (cdr pair))))
(org-babel-sh-var-to-sh (cdr pair) sep)))
vars "\n") "\n" body "\n\n"))) ;; then the source block body
(org-babel-sh-evaluate session full-body result-type)))
@ -61,11 +62,12 @@ function is called by `org-babel-execute-src-block'."
"Prepare SESSION according to the header arguments specified in PARAMS."
(let* ((session (org-babel-sh-initiate-session session))
(vars (org-babel-ref-variables params))
(sep (cdr (assoc :separator params)))
(var-lines (mapcar ;; define any variables
(lambda (pair)
(format "%s=%s"
(car pair)
(org-babel-sh-var-to-sh (cdr pair))))
(org-babel-sh-var-to-sh (cdr pair) sep)))
vars)))
(org-babel-comint-in-buffer session
(mapc (lambda (var)
@ -84,11 +86,16 @@ function is called by `org-babel-execute-src-block'."
;; helper functions
(defun org-babel-sh-var-to-sh (var)
(defun org-babel-sh-var-to-sh (var &optional sep)
"Convert an elisp var into a string of shell commands
specifying a var of the same value."
(if (listp var)
(concat "[" (mapconcat #'org-babel-sh-var-to-sh var ", ") "]")
(flet ((deep-string (el)
(if (listp el)
(mapcar #'deep-string el)
(format "%S" el))))
(format "$(cat <<BABEL_TABLE\n%s\nBABEL_TABLE\n)"
(orgtbl-to-generic (deep-string var) (list :sep (or sep "\t")))))
(format "%S" var)))
(defun org-babel-sh-table-or-results (results)