diff --git a/src/params.lisp b/src/params.lisp index 0c4726e..4e22798 100644 --- a/src/params.lisp +++ b/src/params.lisp @@ -57,8 +57,8 @@ (defparameter *state* nil "State of the current loading.") -(defparameter *csv-path-root* - (merge-pathnames "csv/" (user-homedir-pathname))) +(defparameter *csv-path-root* nil + "Where to load CSV files from, when loading from an archive.") (defparameter *root-dir* (make-pathname :directory "/tmp/pgloader/") diff --git a/src/sources/sources.lisp b/src/sources/sources.lisp index e8507a5..d1c3b83 100644 --- a/src/sources/sources.lisp +++ b/src/sources/sources.lisp @@ -189,7 +189,9 @@ (:inline (car part)) ; because of &rest (:stdin *standard-input*) (:regex (destructuring-bind (keep regex root) part - (filter-directory regex :keep keep :root root))) + (filter-directory regex + :keep keep + :root (or *csv-path-root* root)))) (:filename (let* ((filename (first part)) (realname (if (fad:pathname-absolute-p filename) filename