X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=pctb%2Fresolve.c;h=0bd05792ee2b91d3adc404f732be4be402c2ef04;hp=052ec32fbb3981451ee25f3186a198c936f4c4fd;hb=ab4295d148c3112ab2859fac0349152d9b6987be;hpb=4c375a59891a4161e30bd67709a1ad5d1950a850

diff --git a/pctb/resolve.c b/pctb/resolve.c
index 052ec32..0bd0579 100644
--- a/pctb/resolve.c
+++ b/pctb/resolve.c
@@ -25,6 +25,7 @@
  *  sponsored by Three Rings.
  */
 
+#include "convert.h"
 #include "ocr.h"
 
 static FILE *resolver;
@@ -48,17 +49,20 @@ FILE *resolve_start(void) {
       /* we know donepipe[1] is >= 4 and we have dealt with all the others
        * so we aren't in any danger of overwriting some other fd 4: */
       sysassert( dup2(donepipe[1],4) ==4 );
-      execlp(o_resolver, o_resolver,
-	     DEBUGP(callout) ? "--debug" : "--noop-arg",
-	     "--automatic-1",
-	     (char*)0);
-      sysassert(!"execlp ocr-resolver failed");
+      EXECLP_HELPER("dictionary-manager",
+		    DEBUGP(callout) ? "--debug" : "--noop-arg",
+		    o_quiet ? "--quiet" : "--noop-arg",
+		    "--automatic-1",
+		    (char*)0);
+      sysassert(!"execlp dictionary-manager --automatic failed");
     }
     sysassert(! close(jobpipe[0]) );
     sysassert(! close(donepipe[1]) );
     resolver= fdopen(jobpipe[1],"w"); sysassert(resolver);
     resolver_done= donepipe[0];
   }
+
+  progress("");
   return resolver;
 }
 
@@ -78,7 +82,7 @@ void resolve_finish(void) {
   }
 
   if (r==0) {
-    waitpid_check_exitstatus(resolver_pid, "character resolver");
+    waitpid_check_exitstatus(resolver_pid, "dictionary-manager");
     fclose(resolver);
     close(resolver_done);
     resolver= 0;