mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 21:37:50 +00:00
Code Releases Activity

babel: return string results from octave as strings

Browse source 
Thanks to Darlan Cavalcante
This commit is contained in:
Dan Davison 2010-04-07 15:51:04 -04:00
parent 9a8b05cb70
commit f03c981fc0
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/babel/lisp/langs/org-babel-matlab.el
View file

@ -48,6 +48,10 @@
(defvar org-babel-matlab-shell-command "matlab -nosplash"
"Shell command to use to run matlab as an external process.")
(defvar org-babel-matlab-wrapper-method
"%s
save -ascii %s ans")
(defun org-babel-execute:matlab (body params)
"Execute a block of matlab code with org-babel."
(org-babel-execute:octave body params 'matlab))

25
contrib/babel/lisp/langs/org-babel-octave.el
View file

@ -100,9 +100,9 @@ then create. Return the initialized session."
(rename-buffer (if (bufferp session) (buffer-name session)
(if (stringp session) session (buffer-name)))) (current-buffer))))))
(defvar org-babel-octave-wrapper-method
(defvar org-babel-octave-wrapper-method
"%s
save -ascii %s ans")
save -text %s ans")
(defvar org-babel-octave-eoe-indicator "\'org_babel_eoe\'")
@ -130,12 +130,13 @@ value of the last statement in BODY, as elisp."
(let* ((tmp-file (make-temp-file "org-babel-results-")) exit-code
(stderr
(with-temp-buffer
(insert (format org-babel-octave-wrapper-method body tmp-file))
(insert (format (if matlabp org-babel-matlab-wrapper-method org-babel-octave-wrapper-method)
body tmp-file))
(setq exit-code (org-babel-shell-command-on-region
(point-min) (point-max) cmd nil 'replace (current-buffer)))
(buffer-string))))
(if (> exit-code 0) (org-babel-error-notify exit-code stderr))
(org-babel-import-elisp-from-file (org-babel-maybe-remote-file tmp-file))))))))
(org-babel-octave-import-elisp-from-file (org-babel-maybe-remote-file tmp-file))))))))
(defun org-babel-octave-evaluate-session (session body result-type &optional matlabp)
(let* ((tmp-file (make-temp-file "org-babel-results-"))
@ -148,13 +149,14 @@ value of the last statement in BODY, as elisp."
(value
(mapconcat
#'org-babel-chomp
(list (format org-babel-octave-wrapper-method body tmp-file) org-babel-octave-eoe-indicator) "\n"))))
(list (format (if matlabp org-babel-matlab-wrapper-method org-babel-octave-wrapper-method)
body tmp-file) org-babel-octave-eoe-indicator) "\n"))))
(raw (org-babel-comint-with-output session
(if matlabp org-babel-octave-eoe-indicator org-babel-octave-eoe-output) t
(insert full-body) (comint-send-input nil t))) results)
(case result-type
(value
(org-babel-import-elisp-from-file (org-babel-maybe-remote-file tmp-file)))
(org-babel-octave-import-elisp-from-file (org-babel-maybe-remote-file tmp-file)))
(output
(progn
(setq results
@ -166,6 +168,17 @@ value of the last statement in BODY, as elisp."
(mapcar #'org-babel-trim raw)))))))
(mapconcat #'identity (reverse results) "\n"))))))
(defun org-babel-octave-import-elisp-from-file (file-name)
"Import data written to file by octave.
This removes initial blank and comment lines and then calls
`org-babel-import-elisp-from-file'."
(let ((temp-file (make-temp-file "org-babel-results-")))
(with-temp-file temp-file
(insert-file-contents file-name)
(re-search-forward "^[ \t]*[^# \t]" nil t)
(delete-region (point-min) (point-at-bol)))
(org-babel-import-elisp-from-file temp-file)))
(defun org-babel-octave-read-string (string)
"Strip \\\"s from around octave string"
(if (string-match "^\"\\([^\000]+\\)\"$" string)