Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -266,51 +266,10 @@ (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem.")) (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn)))) ))) - - - - -;; ;; This routine creates the db. It is only called if the db is not already opened -;; ;; -;; (define (db:open-rundb dbstruct run-id #!key (attemptnum 0)(do-not-open #f)) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) -;; (let* ((dbfile (db:dbfile-path run-id)) ;; (conc toppath "/db/" run-id ".db")) -;; (dbexists (common:file-exists? dbfile)) -;; (db (db:lock-create-open dbfile (lambda (db) -;; (handle-exceptions -;; exn -;; (begin -;; ;; (release-dot-lock dbpath) -;; (if (> attemptnum 2) -;; (debug:print-error 0 *default-log-port* "tried twice, cannot create/initialize db for run-id " run-id ", at path " dbpath) -;; (db:open-rundb dbstruct run-id attemptnum (+ attemptnum 1)))) -;; (db:initialize-run-id-db db) -;; (sqlite3:execute -;; db -;; "INSERT OR IGNORE INTO tests (id,run_id,testname,event_time,item_path,state,status) VALUES (?,?,'bogustest',strftime('%s','now'),'nowherepath','DELETED','n/a');" -;; (* run-id 30000) ;; allow for up to 30k tests per run -;; run-id) -;; ;; do a dummy query to test that the table exists and the db is truly readable -;; (sqlite3:execute db "SELECT * FROM tests WHERE id=?;" (* run-id 30000)) -;; )))) ;; add strings db to rundb, not in use yet -;; (olddb (if *megatest-db* -;; *megatest-db* -;; (let ((db (db:open-megatest-db))) -;; (set! *megatest-db* db) -;; db))) -;; (write-access (file-write-access? dbfile))) -;; (if (and dbexists (not write-access)) -;; (set! *db-write-access* #f)) ;; only unset so other db's also can use this control -;; (dbr:dbstruct-rundb-set! dbstruct (cons db dbfile)) -;; (dbr:dbstruct-inuse-set! dbstruct #t) -;; (dbr:dbstruct-olddb-set! dbstruct olddb) -;; ;;; (mutex-unlock! *rundb-mutex*) ;;; why did we need a mutex on opening db's? -;; (db:sync-tables db:sync-tests-only *megatest-db* db) -;; db)) - ;; This routine creates the db if not already present. It is only called if the db is not already opened ;; (define (db:open-db dbstruct #!key (areapath #f)(do-sync #t)) ;; TODO: actually use areapath (let ((tmpdb-stack (dbr:dbstruct-dbstack dbstruct))) ;; RA => Returns the first reference in dbstruct (if (stack? tmpdb-stack) Index: junk/cube.scm ================================================================== --- junk/cube.scm +++ junk/cube.scm @@ -76,11 +76,11 @@ ) (define data (map (lambda (inl) (map string->number (string-split inl))) - (with-input-from-file "data.scm" + (with-input-from-file "data.txt" read-lines))) (print "data: " data) (use trace) ADDED junk/data.txt Index: junk/data.txt ================================================================== --- /dev/null +++ junk/data.txt @@ -0,0 +1,27 @@ +0 0 0 1 2 3 4 5 6 +0 0 1 1 2 3 4 5 6 +0 0 2 1 2 3 4 5 6 +0 1 0 1 2 3 4 5 6 +0 1 1 1 2 3 4 5 6 +0 1 2 1 2 3 4 5 6 +0 2 0 1 2 3 4 5 6 +0 2 1 1 2 3 4 5 6 +0 2 2 1 2 3 4 5 6 +1 0 0 1 2 3 4 5 6 +1 0 1 1 2 3 4 5 6 +1 0 2 1 2 3 4 5 6 +1 1 0 1 2 3 4 5 6 +1 1 1 1 2 3 4 5 6 +1 1 2 1 2 3 4 5 6 +1 2 0 1 2 3 4 5 6 +1 2 1 1 2 3 4 5 6 +1 2 2 1 2 3 4 5 6 +2 0 0 1 2 3 4 5 6 +2 0 1 1 2 3 4 5 6 +2 0 2 1 2 3 4 5 6 +2 1 0 1 2 3 4 5 6 +2 1 1 1 2 3 4 5 6 +2 1 2 1 2 3 4 5 6 +2 2 0 1 2 3 4 5 6 +2 2 1 1 2 3 4 5 6 +2 2 2 1 2 3 4 5 6