Changeset main,3 for main/xbase.lisp

Timestamp:

10/03/2007 05:29:16 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

xbase

revision id:

dsowen@fugue88.ws-20071003052916-lerpjpvvmfisu4v3

Message:

Pretty-print the SQL.
Fix read-dbf for new data structure.

File:

• main/xbase.lisp (modified) (2 diffs)

main/xbase.lisp

@@ -152 +152 @@
 
 (defun sql-create (name descs)
-  (format nil "CREATE TABLE ~A(~{~A~@{,~A~}~});"
+  (format nil "CREATE TABLE ~A~%   (~{~A~@{,~%    ~A~}~})"
           name
           (mapcar 'sql-column descs)))
@@ -182 +182 @@
 
 (defun read-dbf (type)
-  (let* ((filename (gethash type *dbfs*))
-         (header (read-dbf-structure filename)))
-    (with-open-file (in filename :element-type '(unsigned-byte 8))
-      (file-position in (slot-value header 'header-length))
-      (read-records in type))))
+  (let ((dbf-desc (gethash type *dbfs*)))
+    (with-slots (filename) dbf-desc
+      (let ((header (read-dbf-structure filename)))
+        (with-open-file (in filename :element-type '(unsigned-byte 8))
+          (file-position in (slot-value header 'header-length))
+          (read-records in type))))))
 
 (define-dbf-struct unit-type "/home/dsowen/scott/local/bent-data/bentutyp.dbf")