racket: aufgraeumt, data2c gefixt

1 files changed, 7 insertions, 13 deletions

diff --git a/ebus-racket/inserter.rkt b/ebus-racket/inserter.rkt
index b07207d..657154f 100755
--- a/ebus-racket/inserter.rkt
+++ b/ebus-racket/inserter.rkt
@@ -3,10 +3,10 @@
 (require racket/cmdline
 	 racket/tcp
 	 racket/match
-	 "db.rkt"
-	 "layer7.rkt"
-	 "layer2.rkt"
-	 "tcp-repl.rkt")
+	 "ebus/db.rkt"
+	 "ebus/layer7.rkt"
+	 "ebus/layer2.rkt"
+	 "util/tcp-repl.rkt")
 
 (define logger (make-logger 'ebus-inserter (current-logger)))
 
@@ -66,14 +66,8 @@
     (loglevel-db? 'debug)]
    ["--insert" "Do Insert into Database"
     (insert? #t)]
-   ["--db-user" user "Datanase User"
-    (db-con-user? user)]
-   ["--db-password" password "Database password"
-    (db-con-password? password)]
-   ["--db-database" database "Database database-name"
-    (db-con-database? database)]
-   ["--db-server" server  "Database Address/Server"
-    (db-con-server? server)])
+   ["--db-file" user "Database file"
+    (db-file? user)])
 
   ;; Init Logging
   (start-logger-thread (make-log-receiver logger 'info)
@@ -83,7 +77,7 @@
 		       (make-log-receiver tcp-repl-logger 'info))
 
   ;; Test Database Connection
-  (when (not (db-pgc-test))
+  (when (not (db-test))
     (log-message logger 'fatal "Failed to connect to database" #t)
     (exit 1))