[bknr-cvs] hans changed trunk/bknr/

[BKNR Commits]

Revision: 4026
Author: hans
URL: http://bknr.net/trac/changeset/4026

resolve conflicts with alexandria
U   trunk/bknr/datastore/src/data/package.lisp
U   trunk/bknr/datastore/src/utils/package.lisp
U   trunk/bknr/datastore/src/utils/utils.lisp
U   trunk/bknr/modules/text/package.lisp
U   trunk/bknr/web/src/packages.lisp

Modified: trunk/bknr/datastore/src/data/package.lisp
===================================================================
--- trunk/bknr/datastore/src/data/package.lisp	2008-11-10 08:20:25 UTC (rev 4025)
+++ trunk/bknr/datastore/src/data/package.lisp	2008-11-10 08:25:02 UTC (rev 4026)
@@ -3,10 +3,11 @@
 (defpackage :bknr.datastore
   (:use :cl :bknr.utils :cl-interpol :cl-ppcre
         :bknr.indices :bknr.statistics
-        :closer-mop )
+        :closer-mop :alexandria)
   #+cmu
   (:shadowing-import-from :common-lisp #:subtypep #:typep)
   (:shadowing-import-from :cl-interpol quote-meta-chars)
+  (:shadowing-import-from :bknr.indices array-index)
   #|  (:shadow :cl #:get-internal-run-time #:get-internal-real-time #:get-universal-time #:sleep) |#
   (:export #:*store-debug*
            #:*store*

Modified: trunk/bknr/datastore/src/utils/package.lisp
===================================================================
--- trunk/bknr/datastore/src/utils/package.lisp	2008-11-10 08:20:25 UTC (rev 4025)
+++ trunk/bknr/datastore/src/utils/package.lisp	2008-11-10 08:25:02 UTC (rev 4026)
@@ -35,8 +35,6 @@
            #:parse-time
 
            ;; filesystem functions
-           #:copy-stream
-           #:copy-file
            #:move-file
            #:directory-empty-p
            #:subdir-p

Modified: trunk/bknr/datastore/src/utils/utils.lisp
===================================================================
--- trunk/bknr/datastore/src/utils/utils.lisp	2008-11-10 08:20:25 UTC (rev 4025)
+++ trunk/bknr/datastore/src/utils/utils.lisp	2008-11-10 08:25:02 UTC (rev 4026)
@@ -163,19 +163,6 @@
 		     0 (length (pathname-directory dir)))
 	     (pathname-directory dir)))))
 
-(defun copy-file (source target &key (overwrite t))
-  (let ((buffer (make-array 4096 :element-type '(unsigned-byte 8)))
-	(read-count 0))
-    (with-open-file (in source :direction :input 
-			:element-type '(unsigned-byte 8))
-      (with-open-file (out target :direction :output 
-			   :element-type '(unsigned-byte 8)
-			   :if-exists (if overwrite :overwrite :error) :if-does-not-exist :create)
-	(loop
-	 (setf read-count (read-sequence buffer in))
-	 (write-sequence buffer out :end read-count)
-	 (when (< read-count 4096) (return)))))))
-
 (defun move-file (file1 file2)
   #+(or allegro openmcl)
   (rename-file file1 file2)
@@ -186,19 +173,6 @@
   (sb-unix:unix-rename (namestring file1)
 		       (namestring file2)))
 
-(defun copy-stream (in out &optional (element-type '(unsigned-byte 8)))
-  "Copy everything from in to out"
-  (let* ((buffer-size 4096)
-	 (buffer (make-array buffer-size :element-type element-type)))
-    (labels ((read-chunks ()
-			  (let ((size (read-sequence buffer in)))
-			    (if (< size buffer-size)
-				(write-sequence buffer out :start 0 :end size)
-			      (progn
-				(write-sequence buffer out)
-				(read-chunks))))))
-      (read-chunks))))
-
 (defun make-temporary-pathname (&key (defaults nil) (name "tmp"))
   (loop for file = (make-pathname :name (format nil "~A-~A-~A"
 						name

Modified: trunk/bknr/modules/text/package.lisp
===================================================================
--- trunk/bknr/modules/text/package.lisp	2008-11-10 08:20:25 UTC (rev 4025)
+++ trunk/bknr/modules/text/package.lisp	2008-11-10 08:25:02 UTC (rev 4026)
@@ -18,7 +18,6 @@
         :alexandria)
   (:shadowing-import-from :bknr.indices array-index)
   (:shadowing-import-from :cl-interpol quote-meta-chars)
-  (:shadowing-import-from :alexandria #:copy-stream #:copy-file)
   (:export
    ;; billboards
    #:list-billboards-page

Modified: trunk/bknr/web/src/packages.lisp
===================================================================
--- trunk/bknr/web/src/packages.lisp	2008-11-10 08:20:25 UTC (rev 4025)
+++ trunk/bknr/web/src/packages.lisp	2008-11-10 08:25:02 UTC (rev 4026)
@@ -164,7 +164,6 @@
   (:shadowing-import-from :cl-interpol #:quote-meta-chars)
   (:shadowing-import-from :hunchentoot #:host)
   (:shadowing-import-from :alexandria #:array-index)
-  (:shadowing-import-from :alexandria #:copy-stream #:copy-file)
   (:export #:*user*
 	   #:with-http-request
 	   #:with-http-body
@@ -405,7 +404,6 @@
 	:bknr.user)
   (:shadowing-import-from :cl-interpol #:quote-meta-chars)
   (:shadowing-import-from :bknr.indices #:array-index)
-  (:shadowing-import-from :alexandria #:copy-stream #:copy-file)
   (:export #:imageproc
 	   #:define-imageproc-handler
 	   #:image-handler			; plain images only