X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=downloads.lisp;h=855505b0a948a85c69dab5825836388052e7c6b7;hp=f0e16b62ad7ff302a91183feb4f4bd9d0d163e3d;hb=43ab031bb96c1c9c872856df727a909a82a68ee1;hpb=be1b61b9a1a19ea618b9cd854d6539957c4efd57

diff --git a/downloads.lisp b/downloads.lisp
index f0e16b6..855505b 100644
--- a/downloads.lisp
+++ b/downloads.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: downloads.lisp,v 1.2 2003/07/12 17:54:05 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of LML2, is Copyright (c) 2000-2003 by Kevin Rosenberg.
 ;;;; Rights of modification and redistribution are in the LICENSE file.
@@ -24,9 +24,9 @@
   ;;files.sort()
   (mapcar (lambda (f) (print-file f dl-data)) files))
 
-(defun strip-dl-base (file base-name)
+(defun strip-dl-base (file base)
   (let ((fdir (pathname-directory file))
-	(bdir (pathname-directory base-name)))
+	(bdir (pathname-directory base)))
     (make-pathname
      :name (pathname-name file)
      :type (pathname-type file)
@@ -41,7 +41,7 @@
 	(basename (namestring
 		   (make-pathname :name (pathname-name file)
 				  :type (pathname-type file))))
-	(dl-name (strip-dl-base file (dl-data-name dl-data)))
+	(dl-name (strip-dl-base file (dl-data-base dl-data)))
 	(sig-path (concatenate 'string (namestring file) ".asc")))
     (when (plusp (length basename))
       (with-open-file (strm file :direction :input)
@@ -60,10 +60,11 @@
   (lml-princ "<h1>Download</h1>")
   (lml-princ "<div class=\"mainbody\">")
   (lml-format "<h3>Browse ~A Download Site</h3>" name)
-  (lml-format "<a style=\"padding-left:20pt;\" href=\"~A\">~A</a>" url url))
+  (let ((*print-circle* nil))
+    (lml-format "<a style=\"padding-left:20pt;\" href=\"~A\">~A</a>" url url)))
 
 (defun display-footer (dl-data)
-  (when (dl-data-signed)
+  (when (dl-data-signed dl-data)
     (lml-princ "<h3>GPG Public Key</h3>")
     (lml-princ "Use this <a href=\"https://www.b9.com/kevin.gpg.asc\">key</a> to verify file signtatures"))
   (lml-princ "</div>"))
@@ -116,7 +117,7 @@
 	    (display-sections sect dl-data))
 	(if (consp value)
 	    (progn
-	      (print-sect-title title)
+	      (print-sect-title title dl-data)
 	      (incf (dl-data-indent dl-data))
 	      (display-sections value dl-data)
 	      (decf (dl-data-indent dl-data)))
@@ -128,7 +129,7 @@
 			       :url dl-url
 			       :name pkg-base
 			       :signed nil)))
-    (display-header pkg-name dl-url dl-data)
+    (display-header pkg-name dl-url)
     (dolist (sect sects)
       (display-sections sect dl-data))
     (display-footer dl-data)))