Update copyright year to 2015

[gnu-emacs] / lisp / org / ob-sqlite.el

diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index b1696d94d3c25563373c8a295288c933428779b2..33c8d9b59fc391ee9ed845b47c96a71bdad89643 100644 (file)
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -27,8 +27,6 @@
 
 ;;; Code:
 (require 'ob)
-(require 'ob-eval)
-(require 'ob-ref)
 
 (declare-function org-fill-template "org" (template alist))
 (declare-function org-table-convert-region "org-table"
@@ -98,43 +96,40 @@ This function is called by `org-babel-execute-src-block'."
          (cons "db " db)))
        ;; body of the code block
        (org-babel-expand-body:sqlite body params)))
-      (if (or (member "scalar" result-params)
-             (member "verbatim" result-params)
-             (member "html" result-params)
-             (member "code" result-params)
-             (equal (point-min) (point-max)))
-         (buffer-string)
-       (org-table-convert-region (point-min) (point-max)
-                                 (if (or (member :csv others)
-                                         (member :column others)
-                                         (member :line others)
-                                         (member :list others)
-                                         (member :html others) separator)
-                                     nil
-                                   '(4)))
-       (org-babel-sqlite-table-or-scalar
-        (org-babel-sqlite-offset-colnames
-         (org-table-to-lisp) headers-p))))))
+      (org-babel-result-cond result-params
+       (buffer-string)
+       (if (equal (point-min) (point-max))
+           ""
+         (org-table-convert-region (point-min) (point-max)
+                                   (if (or (member :csv others)
+                                           (member :column others)
+                                           (member :line others)
+                                           (member :list others)
+                                           (member :html others) separator)
+                                       nil
+                                     '(4)))
+         (org-babel-sqlite-table-or-scalar
+          (org-babel-sqlite-offset-colnames
+           (org-table-to-lisp) headers-p)))))))
 
 (defun org-babel-sqlite-expand-vars (body vars)
   "Expand the variables held in VARS in BODY."
+  ;; FIXME: Redundancy with org-babel-sql-expand-vars!
   (mapc
    (lambda (pair)
      (setq body
           (replace-regexp-in-string
-           (format "\$%s" (car pair))
-           ((lambda (val)
-              (if (listp val)
-                  ((lambda (data-file)
-                     (with-temp-file data-file
-                       (insert (orgtbl-to-csv
-                                val '(:fmt (lambda (el) (if (stringp el)
-                                                            el
-                                                          (format "%S" el)))))))
-                     data-file)
-                   (org-babel-temp-file "sqlite-data-"))
-                (if (stringp val) val (format "%S" val))))
-            (cdr pair))
+           (format "\$%s" (car pair))  ;FIXME: "\$" == "$"!
+           (let ((val (cdr pair)))
+              (if (listp val)
+                  (let ((data-file (org-babel-temp-file "sqlite-data-")))
+                    (with-temp-file data-file
+                      (insert (orgtbl-to-csv
+                               val '(:fmt (lambda (el) (if (stringp el)
+                                                      el
+                                                    (format "%S" el)))))))
+                    data-file)
+                (if (stringp val) val (format "%S" val))))
            body)))
    vars)
   body)
@@ -147,7 +142,7 @@ This function is called by `org-babel-execute-src-block'."
     (mapcar (lambda (row)
              (if (equal 'hline row)
                  'hline
-               (mapcar #'org-babel-read row))) result)))
+               (mapcar #'org-babel-string-read row))) result)))
 
 (defun org-babel-sqlite-offset-colnames (table headers-p)
   "If HEADERS-P is non-nil then offset the first row as column names."