Slave dispatching working

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

diff --git a/src/slave.sml b/src/slave.sml
index d43a8fa..b1303b8 100644 (file)
--- a/src/slave.sml
+++ b/src/slave.sml
@@ -27,8 +27,9 @@ datatype file_action =
 
 type file_status = {action : file_action,
                    domain : string,
+                   dir : string,
                    file : string}
-                  
+
 val fileHandler = ref (fn _ : file_status => ())
 val preHandler = ref (fn () => ())
 val postHandler = ref (fn () => ())
@@ -87,16 +88,16 @@ fun concatTo p fname =
                                visitDir path
                            else if p fname' then
                                shellF ([Config.cat, " ", path, " >>", fname],
-                                              fn cl => "Error concatenating: " ^ cl)
+                                    fn cl => "Error concatenating: " ^ cl)
                            else
                                ();
                            loop ()
                        end
            in
-               TextIO.closeOut (TextIO.openOut fname);
                loop ()
            end
     in
+       TextIO.closeOut (TextIO.openOut fname);
        visitDir Config.resultRoot
     end
 
@@ -105,7 +106,7 @@ fun enumerateTo p sep fname =
        val outf = TextIO.openOut fname
 
        val first = ref true
-       val baseLen = length (String.fields (fn ch => ch = #"/") Config.resultRoot)
+       val baseLen = length (String.fields (fn ch => ch = #"/") Config.resultRoot) + 1
 
        fun visitDir dname =
            let