Fix dumb message name; allow numbers and underscores in database names

[hcoop/domtool2.git] / src / main.sml

diff --git a/src/main.sml b/src/main.sml
index 52dc753..660c892 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -524,7 +524,7 @@ fun requestDbTable p =
     let
        val (user, bio) = requestBio (fn () => ())
     in
-       Msg.send (bio, MsgCreateDbTable p);
+       Msg.send (bio, MsgCreateDb p);
        case Msg.recv bio of
            NONE => print "Server closed connection unexpectedly.\n"
          | SOME m =>
@@ -939,7 +939,9 @@ fun regenerate context =
                else
                    ()
            end
-           handle IO.Io _ => ()
+           handle IO.Io {name, function, ...} =>
+                  (print ("IO error processing user " ^ user ^ ": " ^ function ^ ": " ^ name ^ "\n");
+                   ok := false)
                 | OS.SysErr (s, _) => (print ("System error processing user " ^ user ^ ": " ^ s ^ "\n");
                                        ok := false)
                 | ErrorMsg.Error => (ErrorMsg.reset ();
@@ -1283,7 +1285,7 @@ fun service () =
                                                   SOME ("Error adding user: " ^ msg)))
                                      (fn () => ())
 
-                              | MsgCreateDbTable {dbtype, dbname} =>
+                              | MsgCreateDb {dbtype, dbname} =>
                                 doIt (fn () =>
                                          if Dbms.validDbname dbname then
                                              case Dbms.lookup dbtype of