From 207af41acdbd2225c5d3210c991be8ab2835280f Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 3 Feb 2003 00:43:36 +0000
Subject: [PATCH] r3926: Auto commit for Debian build

---
 debian/changelog |  7 +++++++
 downloads.lisp   | 38 +++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd1af30..a0ee5be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-lml (2.2.0-1) unstable; urgency=low
+
+  * downloads.lisp: Change from FTP to more general Download term to better 
+  handle HTTP downloads.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun,  2 Feb 2003 17:15:27 -0700
+
 cl-lml (2.1.3-1) unstable; urgency=low
 
   * New upstream: Add th and textarea
diff --git a/downloads.lisp b/downloads.lisp
index 4223820..8cd2e32 100644
--- a/downloads.lisp
+++ b/downloads.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: downloads.lisp,v 1.7 2003/01/24 08:51:41 kevin Exp $
+;;;; $Id: downloads.lisp,v 1.8 2003/02/03 00:43:36 kevin Exp $
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,8 +20,8 @@
 (in-package :lml)
 
 
-(defvar *ftp-base*)
-(defvar *ftp-url*)
+(defvar *dl-base*)
+(defvar *dl-url*)
 (defvar *base-name*)
 (defvar *section-indent* 0)
 (defvar *signed* nil)
@@ -31,9 +31,9 @@
   ;;files.sort()
   (mapcar #'print-file files))
 
-(defun strip-ftp-base (file)
+(defun strip-dl-base (file)
   (let ((fdir (pathname-directory file))
-	(bdir (pathname-directory *ftp-base*)))
+	(bdir (pathname-directory *dl-base*)))
     (make-pathname
      :name (pathname-name file)
      :type (pathname-type file)
@@ -48,23 +48,23 @@
 	(basename (namestring
 		   (make-pathname :name (pathname-name file)
 				  :type (pathname-type file))))
-	(ftp-name (strip-ftp-base file))
+	(dl-name (strip-dl-base file))
 	(sig-path (concatenate 'string (namestring file) ".asc")))
     (when (plusp (length basename))
       (with-open-file (strm file :direction :input)
 		      (setq size (round (/ (file-length strm) 1024))))
-      (lml-format "<a href=\"~A~A\">~A</a>" *ftp-url* ftp-name basename)
+      (lml-format "<a href=\"~A~A\">~A</a>" *dl-url* dl-name basename)
       (lml-princ "<span class=\"modtime\">")
       (lml-format " (~A, <b>~:D <span style=\"font-size:90%;\">KB</span></b>)</span>" modtime size)
       (when (probe-file sig-path)
 	(setq *signed* t)
-	(lml-format " [<a href=\"~A~A.asc\">Signature</a>]" *ftp-url* ftp-name))
+	(lml-format " [<a href=\"~A~A.asc\">Signature</a>]" *dl-url* dl-name))
       (br))))
 
 (defun display-header (name url)
   (lml-princ "<h1>Download</h1>")
   (lml-princ "<div class=\"mainbody\">")
-  (lml-format "<h3>Browse ~A FTP Site</h3>" name)
+  (lml-format "<h3>Browse ~A Download Site</h3>" name)
   (lml-format "<a style=\"padding-left:20pt;\" href=\"~A\">~A</a>" url url))
 
 (defun display-footer ()
@@ -121,29 +121,29 @@
 	      (decf *section-indent*))
 	  (display-one-section title value))))))
       
-(defun display-page (pkg-name pkg-base ftp-base ftp-url sects)
+(defun display-page (pkg-name pkg-base dl-base dl-url sects)
   (let ((*section-indent* 3)
-	(*ftp-base* ftp-base)
-	(*ftp-url* ftp-url)
+	(*dl-base* dl-base)
+	(*dl-url* dl-url)
 	(*base-name* pkg-base)
 	(*signed* nil))
-    (display-header pkg-name ftp-url)
+    (display-header pkg-name dl-url)
     (map nil #'display-sections sects)
     (display-footer)))
 
-(defun std-dl-page (pkg-name pkg-base ftp-base ftp-url)
-  (let ((base (parse-namestring ftp-base)))
+(defun std-dl-page (pkg-name pkg-base dl-base dl-url)
+  (let ((base (parse-namestring dl-base)))
     (let ((tgz-path (make-pathname :defaults base :type "gz" :name :wild))
 	  (zip-path (make-pathname :defaults base :type "zip" :name :wild))
 	  (doc-path (make-pathname :defaults base :type "pdf" :name :wild)))
-      (display-page pkg-name pkg-base ftp-base ftp-url
+      (display-page pkg-name pkg-base dl-base dl-url
 		    `(("Manual" ,doc-path)
 		      ("Source Code"
 		       (("Unix (.tar.gz)" ,tgz-path)
 			("Windows (.zip)" ,zip-path))))))))
   
-(defun full-dl-page (pkg-name pkg-base ftp-base ftp-url)
-  (let ((base (parse-namestring ftp-base)))
+(defun full-dl-page (pkg-name pkg-base dl-base dl-url)
+  (let ((base (parse-namestring dl-base)))
     (let ((tgz-path (make-pathname :defaults base :type "gz" :name :wild))
 	  (zip-path (make-pathname :defaults base :type "zip" :name :wild))
 	  (doc-path (make-pathname :defaults base :type "pdf" :name :wild))
@@ -159,7 +159,7 @@
 		     (make-pathname :directory '(:relative "win32")
 				    :type :wild :name :wild)
 		     base)))
-      (display-page pkg-name pkg-base ftp-base ftp-url
+      (display-page pkg-name pkg-base dl-base dl-url
 		    `(("Manual" ,doc-path)
 		      ("Source Code"
 		       (("Unix (.tar.gz)" ,tgz-path)
-- 
2.34.1