Index: trunk/csv.lisp
===================================================================
--- trunk/csv.lisp	(revision 2)
+++ trunk/csv.lisp	(revision 4)
@@ -1,3 +1,20 @@
 ;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp -*-
+
+#|
+Copyright (C) 2007, 2008  David Owen <dsowen@fugue88.ws>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser Public License for more details.
+
+You should have received a copy of the GNU Lesser Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+|#
 
 (defpackage #:dso-csv
@@ -14,5 +31,5 @@
 
 
-(flet ((trim (s) (substring s :start 1 :length (- (length s) 2))))
+(flet ((trim (s) (dso-parse::substring s :start 1 :length (- (length s) 2))))
   (defun un-squote (s)
     (cl-ppcre:regex-replace-all "''" (trim s) "'"))
@@ -59,6 +76,6 @@
   (file (+ row))
   (row (t-value (* row-rest) (= t-newline))
-       (lambda (row) (cons (caar row) (mapcar #'second (second row)))))
-  (row-rest ((= t-comma) t-value) car))
+       :filter (lambda (row) (cons (caar row) (mapcar #'second (second row)))))
+  (row-rest ((= t-comma) t-value) :filter car))