Commit 69b5aee3 authored by Paul Van Eecke's avatar Paul Van Eecke
Browse files

Merge branch 'minor-fixes' into 'master'

Minor fixes

See merge request ehai/babel-core!1
parents 1e887b53 0c3cf299
......@@ -51,8 +51,8 @@
(format t "~&~%* Initializing BABEL.")
(format t "~% The BABEL path is: ~a" (directory-namestring *babel-path*))
;; put's the feature :hunchentoot-available-on-this-platform on
;; *features* except in some cases
;; Puts the feature :hunchentoot-available-on-this-platform on
;; *features* except in some cases.
(eval-when (:compile-toplevel :load-toplevel :execute)
(when (or (and (find :sbcl *features*) (find :sb-thread *features*))
(find :cmucl *features*)
......
......@@ -297,23 +297,14 @@
year month day hour min sec))
(string-downcase experiment-class)
"-" (pathname-name file-name) "." (pathname-type file-name)))
#+sbcl
(defun make-file-name-with-job-and-task-id (file-name experiment-class)
"A helper function for making file-names that contain the time and the experiment class"
(mkstr (make-pathname :directory (pathname-directory file-name))
(format nil "~a-~a-" (sb-unix::posix-getenv "SLURM_ARRAY_JOB_ID")
(sb-unix::posix-getenv "SLURM_ARRAY_TASK_ID"))
(string-downcase experiment-class)
"-" (pathname-name file-name) "." (pathname-type file-name)))
#+(or lispworks ccl)
(defun make-file-name-with-job-and-task-id (file-name experiment-class)
"A helper function for making file-names that contain the time and the experiment class"
(mkstr (make-pathname :directory (pathname-directory file-name))
(format nil "~a-~a-" (ccl::getenv "SLURM_ARRAY_JOB_ID")
(ccl::getenv "SLURM_ARRAY_TASK_ID"))
(format nil "~a-~a-" (uiop/os:getenv "SLURM_ARRAY_JOB_ID")
(uiop/os:getenv "SLURM_ARRAY_TASK_ID"))
(string-downcase experiment-class)
"-" (pathname-name file-name) "." (pathname-type file-name)))
"-" (pathname-name file-name) "." (pathname-type file-name)))
(defun make-file-name-with-time (file-name)
"A helper function for making file-names that contain the time"
......@@ -323,12 +314,3 @@
(format nil "~d-~2,'0d-~2,'0d-~2,'0d-~2,'0d-~2,'0d-"
year month day hour min sec))
(pathname-name file-name) "." (pathname-type file-name)))
;; #+sbcl
;; (defun make-file-name-with-job-and-task-id (file-name experiment-class)
;; "A helper function for making file-names that contain the time and the experiment class"
;; (mkstr (make-pathname :directory (pathname-directory file-name))
;; (format nil "~a-~a-" (sb-unix::posix-getenv "SLURM_ARRAY_JOB_ID")
;; (sb-unix::posix-getenv "SLURM_ARRAY_TASK_ID"))
;; (string-downcase experiment-class)
;; "-" (pathname-name file-name) "." (pathname-type file-name)))
......@@ -103,6 +103,7 @@
and returns the resulting svg xml expression."
(pipe-through (input output "dot" "-Tsvg")
(s-dot:s-dot->dot input s-dot-expression)
(force-output input)
(unless (eq input output) (close input))
(let ((lines nil) (line nil))
(loop do (setf line (read-line output nil))
......
......@@ -115,7 +115,7 @@
(defun start-web-interface (&key (port *port*) (address *address*))
(if *my-server*
(format t "~% ***** web interface already running at http://~a:~d *****~%"
*address* *port*)
address port)
(progn
(setf *my-server*
(start (make-instance 'easy-acceptor
......@@ -126,7 +126,7 @@
:message-log-destination nil
:access-log-destination nil)))
(format t "~% ***** started web interface at http://~a:~d *****~%"
*address* *port*))))
address port))))
;; automatically start the server when the asdf system is loaded
(when (and cl-user::*automatically-start-web-interface*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment