aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ravanan/command-line-tool.scm7
-rw-r--r--ravanan/work/command-line-tool.scm7
2 files changed, 7 insertions, 7 deletions
diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm
index 49bfec6..ce4bdbc 100644
--- a/ravanan/command-line-tool.scm
+++ b/ravanan/command-line-tool.scm
@@ -876,13 +876,6 @@ same as in @code{run-workflow} from @code{(ravanan workflow)}."
(cons "location" (string-append "file://" destination-path))
(cons "path" destination-path))))
- (define (secondary-path path secondary-file)
- "Derive path to @var{secondary-file} from primary @var{path}."
- (let ((pattern (assoc-ref* secondary-file "pattern")))
- ;; TODO: Implement ? and ^ characters in SecondaryFileSchema
- ;; DSL.
- (string-append path pattern)))
-
(define (capture-secondary-file path secondary-file
workflow-output-directory)
"Capture @var{secondary-file} for primary @var{path} and return its
diff --git a/ravanan/work/command-line-tool.scm b/ravanan/work/command-line-tool.scm
index 853b4fb..d33c80c 100644
--- a/ravanan/work/command-line-tool.scm
+++ b/ravanan/work/command-line-tool.scm
@@ -42,6 +42,7 @@
checksum
location->path
canonicalize-file-value
+ secondary-path
evaluate-javascript))
(define (value->string x)
@@ -247,6 +248,12 @@ actually paths."
(just (vector-map canonicalize-file-value
secondary-files)))))))
+(define (secondary-path path secondary-file)
+ "Derive path to @var{secondary-file} from primary @var{path}."
+ (let ((pattern (assoc-ref* secondary-file "pattern")))
+ ;; TODO: Implement ? and ^ characters in SecondaryFileSchema DSL.
+ (string-append path pattern)))
+
(define* (evaluate-javascript node expression #:optional (preamble ""))
"Evaluate javascript @var{expression} using @var{node}. Evaluate
@var{preamble} before evaluating @var{expression}."