Import Upstream version 3a1upstream/3a1

1 files changed, 7 insertions, 7 deletions

diff --git a/dbrowse.scm b/dbrowse.scm
index e186492..9401c6d 100644
--- a/dbrowse.scm
+++ b/dbrowse.scm
@@ -8,7 +8,7 @@
 ;1.  Any copy made of this software must include this copyright notice
 ;in full.
 ;
-;2.  I have made no warrantee or representation that the operation of
+;2.  I have made no warranty or representation that the operation of
 ;this software will be error-free, and I am under no obligation to
 ;provide any services, by way of maintenance, update, or otherwise.
 ;
@@ -17,11 +17,11 @@
 ;promotional, or sales literature without prior written consent in
 ;each case.
 
-(require 'database-utilities)
+(require 'databases)
 (require 'printf)
 
 (define browse:db #f)
-
+;@
 (define (browse . args)
   (define table-name #f)
   (cond ((null? args))
@@ -48,8 +48,8 @@
 
 (define (browse:display-dir table-name table)
   (printf "%s Tables:\\n" table-name)
-  ((table 'for-each-row)
-   (lambda (row) (printf "\\t%s\\n" (car row)))))
+  ((or (table 'for-each-row-in-order) (table 'for-each-row))
+   (lambda (row) (printf "\\t%a\\n" (car row)))))
 
 (define (browse:display-table table-name table)
   (let* ((width 18)
@@ -73,7 +73,7 @@
     (newline)
     (for-each (lambda (type)
 		(case type
-		  ((integer number uint base-id)
+		  ((integer number ordinal base-id uint)
 		   (set! form (string-append form dw-integer)))
 		  ((boolean domain expression atom)
 		   (set! form (string-append form dwp-any)))
@@ -87,6 +87,6 @@
     (for-each (lambda (domain) (printf underline))
 	      (table 'column-domains))
     (newline)
-    ((table 'for-each-row)
+    ((or (table 'for-each-row-in-order) (table 'for-each-row))
      (lambda (row)
        (apply printf form row)))))