X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=blobdiff_plain;f=parse-common.lisp;h=25d3ee3f11bc0dff11d8d1083dcb5a8bba3911ae;hp=ba7aef61c816e8b8d4bf6897254dcfefabe9efc1;hb=f4ea91e2cf0eb22db02498e54d1f75ef5dcd4239;hpb=756b9f208a0f807c326b0ecc6d29bfc73967440e diff --git a/parse-common.lisp b/parse-common.lisp index ba7aef6..25d3ee3 100644 --- a/parse-common.lisp +++ b/parse-common.lisp @@ -45,10 +45,16 @@ (defun ufile-pathname (ufile &optional (extension "")) "Return pathname for a umls filename with an optional extension" (assert (typep ufile 'ufile)) - (let ((dirs (append (list (dir ufile)) - (awhen (subdir ufile) (list it))))) + (let* ((dirs (append (list (dir ufile)) + (awhen (subdir ufile) (list it)))) + (name-list (delimited-string-to-list (fil ufile) #\.)) + (name (if (second name-list) + (first name-list) + (concatenate 'string (first name-list) (or extension "")))) + (type (when (second name-list) + (concatenate 'string (second name-list) (or extension ""))))) (merge-pathnames - (make-pathname :name (concatenate 'string (fil ufile) extension) + (make-pathname :name name :type type :directory (cons :relative dirs)) *umls-path*)))