X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fconvert.c;h=433b043a3dadd5a043f7f9087733c21262e12160;hp=a0ecca16703749cd47ef6dbd81c03437e2868a33;hb=df798e7f57fac305e26cf1cf6265160ac5219d72;hpb=59acfe7ae6e8c81462dce00da5006166efb63d22

diff --git a/pctb/convert.c b/pctb/convert.c
index a0ecca1..433b043 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -1,409 +1,417 @@
-#include <pam.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define eassert assert
-#define debug stdout
-
-typedef struct {
-  unsigned long rgb; /* on screen */
-  char c; /* canonical */
-} CanonColourInfo;
-
-static int height, width;
-static char *image;
-
-static void debug_flush(void) {
-  eassert(!fflush(debug));
-  eassert(!ferror(debug));
+/*
+ * ypp-commodities main program: argument parsing etc.
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
+
+#include "convert.h"
+
+void debug_flush(void) {
+  sysassert(!ferror(debug));
+  sysassert(!fflush(debug));
 }
 
-typedef struct {
-  int x, y;
-} Point;
+const char *get_vardir(void) { return "."; }
+const char *get_libdir(void) { return "."; }
 
-typedef struct { /* both inclusive */
-  Point tl;
-  Point br;
-} Rect;
-
-static inline char get(int x, int y) { return image[y * width + x]; }
-static inline char get_p(Point p) { return get(p.x,p.y); }
-
-
-#define START_MAIN {200,200}
-#define MIN_COLUMNS         6
-#define INTERESTING_COLUMNS 6
-#define MAX_COLUMNS         7
-
-static Rect mainr = { START_MAIN,START_MAIN };
-static int commbasey, comminty;
-static int colrightx[INTERESTING_COLUMNS];
 
+enum mode {
+  mf_findwindow=      0001,
+  mf_screenshot=      0010,
+  mf_readscreenshot=  0020,
+  mf_analyse=         0100,
+  
+  mode_findwindow=    0001,
+  mode_screenshot=    0011,
+  mode_analyse=       0120,
 
-static const CanonColourInfo canoncolourinfos[]= {
-  { 0x475A5E, '*' }, /* edge */
-  { 0x2C5F7A, '*' }, /* edge just under box heading shadow */
-  { 0x7D9094, '+' }, /* interbox */
-  { 0xBDC5BF, ' ' }, /* background - pale */
-  { 0xADB5AF, ' ' }, /* background - dark */
-  { 0x000000, 'o' }, /* foreground */
-  { 0xD4B356, ' ' }, /* background (cursor) */
-  { 0xFFFFFF, 'o' }, /* foreground (cursor) */
-  { 0,0 }
+  mode_all=           0111,
 };
 
-static void require_rectangle(int tlx, int tly, int brx, int bry,
-			      const char *ok) {
-  int x,y;
-  for (x=tlx; x<=brx; x++)
-    for (y=tly; y<=bry; y++) {
-      int c= get(x,y);
-      assert(strchr(ok,c));
-    }
-}
-static void require_rectangle_r(Rect rr, const char *ok) {
-  require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok);
+enum outmodekind {
+  omk_unset, omk_upload, omk_str, omk_raw, omk_none
+};
+static enum outmodekind o_outmode_kind;
+static const char *o_outmode_str= 0;
+
+static enum mode o_mode= mode_all;
+static char *o_screenshot_fn;
+static const char *o_serv_pctb, *o_serv_dict_fetch, *o_serv_dict_submit;
+
+const char *o_resolver= "./dictionary-manager";
+FILE *screenshot_file;
+const char *o_ocean, *o_pirate;
+int o_quiet;
+
+enum flags o_flags= ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
+
+static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
+static void vbadusage(const char *fmt, va_list al) {
+  fputs("bad usage: ",stderr);
+  vfprintf(stderr,fmt,al);
+  fputc('\n',stderr);
+  exit(12);
 }
+DEFINE_VWRAPPERF(static, badusage, NORET);
 
-static void debug_rect(const char *what, int whati, Rect rr) {
-  int y,r,w;
-  fprintf(debug, "%s %d: %d,%d..%d,%d:\n", what, whati,
-	  rr.tl.x,rr.tl.y, rr.br.x,rr.br.y);
-  w= rr.br.x - rr.tl.x + 1;
-  for (y=rr.tl.y; y<=rr.br.y; y++) {
-    fprintf(debug, "%4d%*s|", y, rr.tl.x,"");
-    r= fwrite(image + y*width + rr.tl.x, 1, w, debug);
-    eassert(r==w);
-    fputc('|',debug);
-    fputc('\n',debug);
-  }
-  debug_flush();
+static void open_screenshot_file(const char *mode) {
+  screenshot_file= fopen(o_screenshot_fn, mode);
+  if (!screenshot_file)
+    fatal("could not open screenshots file `%s': %s",
+	  o_screenshot_fn, strerror(errno));
 }
 
-#define WALK_UNTIL(point,coord,increm,last,edge)			\
-  for (;;) {								\
-    if ((point).coord == (last)+(increm)) break;			\
-    if (get_p((point)) == (edge)) { (point).coord -= (increm); break; }	\
-    (point).coord += (increm);						\
-  }
+static void run_analysis(void) {
+  FILE *tf;
 
-#define WALK_UNTIL_MUST(point,coord,increm,last,edge)	\
-  do {							\
-    WALK_UNTIL(point,coord,increm,last,edge);		\
-    eassert((point).coord != (last)+(increm));		\
-  } while(0)
-
-static void find_structure(void) {
-  Rect whole = { {0,0}, {width-1,height-1} };
-
-  WALK_UNTIL_MUST(mainr.tl, x,-1, whole.tl.x, '*');
-  WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, '*');
-  WALK_UNTIL_MUST(mainr.br, x,+1, whole.br.x, '*');
-  WALK_UNTIL_MUST(mainr.br, y,+1, whole.br.y, '*');
-
-  require_rectangle(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*");
-  require_rectangle(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*");
-  require_rectangle(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*");
-  require_rectangle(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*");
-
-#define CHECK_STRIP_BORDER(tlbr,xy,increm)	\
-  do {						\
-    Point csb_p;				\
-    Rect csb_r;					\
-    csb_p= mainr.tl;				\
-    csb_p.xy= mainr.tlbr.xy;			\
-    if (get_p(csb_p)=='+') {			\
-      csb_r= mainr;				\
-      csb_r.tl.xy= csb_p.xy;			\
-      csb_r.br.xy= csb_p.xy;			\
-      require_rectangle_r(csb_r, "+");		\
-      mainr.tlbr.xy += increm;			\
-    }						\
-  } while(0)
-
-  debug_rect("mainr",0, mainr);
-
-  CHECK_STRIP_BORDER(tl,x,+1);
-  CHECK_STRIP_BORDER(tl,y,+1);
-  CHECK_STRIP_BORDER(br,x,-1);
-  CHECK_STRIP_BORDER(br,y,-1);
-
-  debug_rect("mainr",1, mainr);
-
-  Point up = START_MAIN;
-  WALK_UNTIL_MUST(up, y,-1, mainr.tl.y, '+');
-
-  Point down = START_MAIN;
-  down.y++;
-  WALK_UNTIL_MUST(down, y,+1, mainr.br.y, '+');
-
-  int xscaleunit, y,x;
-  for (y=0, xscaleunit=1; y<4; y++, xscaleunit*=10) {
-    fprintf(debug,"     ");
-    for (x=0; x<=width; x++) {
-      if (x % xscaleunit) fputc(' ',debug);
-      else fprintf(debug,"%d",(x / xscaleunit)%10);
-    }
-    fputc('\n',debug);
+  sysassert( tf= tmpfile() );
+  progress("running recognition...");
+  analyse(tf);
+
+  if (o_flags & ff_upload) {
+    if (o_flags & ff_singlepage)
+      fatal("Recognition successful, but refusing to upload partial data\n"
+	    " (--single-page specified).  Specify an output mode?");
   }
 
-  commbasey= up.y;
-  comminty= down.y - up.y + 2;
-  fprintf(debug, "up.y=%d down.y=%d commbasey=%d comminty=%d\n",
-	  up.y,down.y, commbasey,comminty);
+  sysassert( fseek(tf,0,SEEK_SET) == 0);
 
-  Point across= { mainr.tl.x, commbasey };
-  int colno=0;
-  for (;;) {
-    eassert(get_p(across) != '+');
-    WALK_UNTIL(across, x,+1, mainr.br.x, '+');
-    eassert(colno < MAX_COLUMNS);
-    int colrx= across.x;
-    if (colrx > mainr.br.x) colrx= mainr.br.x;
-    if (colno < INTERESTING_COLUMNS) {
-      colrightx[colno]= colrx;
-      fprintf(debug,"colrightx[%d]= %d\n",colno,colrx);
-    } else {
-      fprintf(debug,"extra colr %d  %d\n",colno,colrx);
-    }
-      
-    colno++;
-    
-    if (across.x >= mainr.br.x-1)
-      break;
-
-    across.x++;
-    require_rectangle(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
-    across.x++;
+  progress_log("processing results (--%s)...", o_outmode_str);
+  pid_t processor;
+  sysassert( (processor= fork()) != -1 );
+
+  if (!processor) {
+    sysassert( dup2(fileno(tf),0) ==0 );
+    EXECLP_HELPER("commod-results-processor", o_outmode_str, (char*)0);
   }
-  eassert(colno >= MIN_COLUMNS);
-}		    
-
-static void find_commodity(int offset, Rect *rr) {
-  /* rr->tl.x==-1 if offset out of range */
-  rr->tl.y= commbasey - offset*comminty;
-  rr->br.y= rr->tl.y + comminty-2;
-  if (rr->tl.y < mainr.tl.y || rr->br.y > mainr.br.y) { rr->tl.x=-1; return; }
-  if (rr->tl.y > mainr.tl.y)
-    require_rectangle(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+");
-  if (rr->br.y < mainr.tl.y)
-    require_rectangle(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+");
-  
-  rr->tl.x= mainr.tl.x;
-  rr->br.x= mainr.br.x;
-}
 
-static void find_table_entry(Rect commod, int colno, Rect *cellr) {
-  cellr->tl.y= commod.tl.y;
-  cellr->br.y= commod.br.y;
-  cellr->tl.x= !colno ? commod.tl.x : colrightx[colno-1]+2;
-  cellr->br.x=                        colrightx[colno];
-  debug_rect("cell", colno, *cellr);
-  require_rectangle_r(*cellr, " o");
+  waitpid_check_exitstatus(processor, "output processor/uploader");
+  fclose(tf);
+  progress_log("all complete.");
 }
 
-static void load_image_and_canonify(void) {
-  struct pam inpam;
-  unsigned char rgb[3];
-  int x,y,r;
-  const CanonColourInfo *cci;
-
-  pnm_readpaminit(stdin, &inpam, sizeof(inpam));
-  height= inpam.height;
-  width= inpam.width;
-  eassert(inpam.maxval == 255);
-  eassert(inpam.bytes_per_sample == 1);
-
-  image= malloc(width*height);
-  eassert(image);
-  memset(image,'?',width*height);
-
-  for (y=0; y<height; y++) {
-    for (x=0; x<width; x++) {
-      r= fread(&rgb,1,3,stdin);  eassert(r==3);
-      unsigned long rgb_l=
-	((unsigned long)rgb[0]<<16) |
-	((unsigned long)rgb[1]<<8) |
-	               (rgb[2]);
-      for (cci=canoncolourinfos; cci->c; cci++)
-	if (cci->rgb == rgb_l) {
-	  image[y*width + x]= cci->c;
-	  break;
-	}
-    }
-    fprintf(debug, "%4d ",y);
-    r= fwrite(image + y*width, 1,width, debug);  eassert(r==width);
-    fputc('\n',debug);
+void fetch_with_rsync(const char *stem) {
+  pid_t fetcher;
+
+  sysassert( (fetcher= fork()) != -1 );
+  if (!fetcher) {
+    const char *rsync= getenv("YPPSC_PCTB_RSYNC");
+    if (!rsync) rsync= "rsync";
+  
+    const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
+    char *remote= masprintf("%s/master-%s.txt", src, stem);
+    char *local= masprintf("#master-%s#.txt", stem);
+    execlp(rsync, "rsync",
+	   DEBUGP(rsync) ? "-vLt" : "-Lt",
+	   "--",remote,local,(char*)0);
+    sysassert(!"exec rsync failed");
   }
-  debug_flush();
+
+  waitpid_check_exitstatus(fetcher, "rsync");
 }
 
-typedef uint32_t Pixcol;
-#define PSPIXCOL(priscan) priscan##32
+static void set_server(const char *envname, const char *defprotocol,
+		       const char *defvalue, const char *defvalue_test,
+		       const char *userspecified,
+		       int enable) {
+  const char *value;
+  
+  if (!enable) { value= "0"; goto ok; }
 
-typedef struct {
-  Pixcol col;
-  struct OCRDatabaseNode *then;
-} OCRDatabaseLink;
+  if (userspecified)
+    value= userspecified;
+  else if ((value= getenv(envname)))
+    ;
+  else if (o_flags & ff_testservers)
+    value= defvalue_test;
+  else
+    value= defvalue;
 
-#define MAXGLYPHCHRS 3
+  if (value[0]=='/' || (value[0]=='.' && value[1]=='/'))
+    /* absolute or relative pathname - or anyway, something with no hostname */
+    goto ok;
 
-typedef struct OCRDatabaseNode {
-  char s[MAXGLYPHCHRS+1]; /* null-terminated; "" means no match here */
-  int nlinks, alinks;
-  OCRDatabaseLink *links;
-} OCRDatabaseNode;
+  const char *colon= strchr(value, ':');
+  const char *slash= strchr(value, '/');
 
-#define N_OCR_CONTEXTS 2
-static OCRDatabaseNode ocr_contexts[N_OCR_CONTEXTS];
+  if (colon && (!slash || colon < slash))
+    /* colon before the first slash, if any */
+    /* rsync :: protocol specification - anyway, adding scheme:// won't help */
+    goto ok;
 
-static void load_ocr_database(void) {
-  int ctx,nchrs;
-  OCRDatabaseNode *current, *additional;
-  char chrs[MAXGLYPHCHRS+1];
-  Pixcol cv;
-  int r,i,j;
+  int vallen= strlen(value);
 
-  FILE *db= fopen("database","r");  eassert(db);
+  value= masprintf("%s%s%s", defprotocol, value,
+		   vallen && value[vallen-1]=='/' ? "" : "/");
 
-  for (;;) {
-    r= fscanf(db, "%d %d", &ctx, &nchrs);
-    if (r==EOF) break;
-    eassert(r==2);
-    eassert(ctx>=0 && ctx<N_OCR_CONTEXTS);
-    eassert(nchrs>0 && nchrs<=MAXGLYPHCHRS);
-
-    for (i=0; i<nchrs; i++) {
-      int c;
-      r= fscanf(db, "%x", &c);  eassert(r==1);
-      eassert(c>0 && c<=255);
-      chrs[i]= c;
-    }
-    chrs[nchrs]= 0;
-
-    int twidth;
-    r= fscanf(db, "%d", &twidth);  eassert(r==1);
-    current= &ocr_contexts[ctx];
-    for (i=0; i<twidth; i++) {
-      r= fscanf(db, "%"PSPIXCOL(SCNx), &cv);  eassert(r==1);
-      for (j=0; j<current->nlinks; j++)
-	if (current->links[j].col == cv) {
-	  current= current->links[j].then;
-	  goto found_link;
-	}
-
-      additional= malloc(sizeof(*additional)); eassert(additional);
-      additional->s[0]= 0;
-      additional->nlinks= additional->alinks= 0;
-      additional->links= 0;
-      if (current->nlinks==current->alinks) {
-	current->alinks++;
-	current->alinks<<=1;
-	current->links= realloc(current->links,
-            sizeof(*current->links) * current->alinks);
-	eassert(current->links);
-      }
-      current->links[current->nlinks].col= cv;
-      current->links[current->nlinks].then= additional;
-      current->nlinks++;
-      current= additional;
-
-    found_link:;
-    }
+ ok:
+  sysassert(! setenv(envname,value,1) );
+}
 
-    eassert(!current->s[0]);
-    strcpy(current->s, chrs);
+int main(int argc, char **argv) {
+  const char *arg;
+
+  sysassert( setlocale(LC_MESSAGES,"") );
+  sysassert( setlocale(LC_CTYPE,"en_GB.UTF-8") ||
+	     setlocale(LC_CTYPE,"en.UTF-8") );
+
+#define ARGVAL  ((*++argv) ? *argv : \
+		 (badusage("missing value for option %s",arg),(char*)0))
+
+#define IS(s) (!strcmp(arg,(s)))
+
+  while ((arg=*++argv)) {
+    if (IS("--find-window-only"))      o_mode= mode_findwindow;
+    else if (IS("--screenshot-only"))  o_mode= mode_screenshot;
+    else if (IS("--analyse-only") ||
+	     IS("--same"))             o_mode= mode_analyse;
+    else if (IS("--everything"))       o_mode= mode_all;
+    else if (IS("--find-island"))      o_flags |= ffs_printisland;
+    else if (IS("--single-page"))      o_flags |= ff_singlepage;
+    else if (IS("--quiet"))            o_quiet= 1;
+    else if (IS("--edit-charset"))     o_flags |= ff_editcharset;
+    else if (IS("--test-servers"))     o_flags |= ff_testservers;
+    else if (IS("--dict-local-only"))  o_flags &= ~ffs_dict;
+    else if (IS("--dict-read-only"))   o_flags &= (~ffs_dict | ff_dict_fetch);
+    else if (IS("--dict-anon"))        o_flags &= ~ff_dict_pirate;
+    else if (IS("--dict-submit"))      o_flags |= ff_dict_fetch|ff_dict_submit;
+    else if (IS("--raw-tsv"))          o_outmode_kind= omk_raw;
+    else if (IS("--upload"))           o_outmode_kind= omk_upload;
+    else if (IS("--arbitrage") ||
+	     IS("--tsv") ||
+	     IS("--best-prices"))      o_outmode_kind=omk_str,
+				       o_outmode_str=arg+2;
+
+    else if (IS("--screenshot-file"))  o_screenshot_fn= ARGVAL;
+    else if (IS("--pctb-server"))         o_serv_pctb=        ARGVAL;
+    else if (IS("--dict-submit-server"))  o_serv_dict_submit= ARGVAL;
+    else if (IS("--dict-update-server"))  o_serv_dict_fetch=  ARGVAL;
+    else if (IS("--ocean"))            o_ocean=  ARGVAL;
+    else if (IS("--pirate"))           o_pirate= ARGVAL;
+#define DF(f)					\
+    else if (IS("-D" #f))			\
+      debug_flags |= dbg_##f;
+    DEBUG_FLAG_LIST
+#undef DF
+    else if (IS("--window-id")) {
+      char *ep;
+      unsigned long windowid= strtoul(ARGVAL,&ep,0);
+      if (*ep) badusage("invalid window id");
+      set_yppclient_window(windowid);
+    } else
+      badusage("unknown option `%s'",arg);
   }
-  eassert(!ferror(db));
-  eassert(feof(db));
-  fclose(db);
-}      
-
-static void ocr_rectangle(Rect r) {
-  int w= r.br.x - r.tl.x + 1;
-  int h= r.br.y - r.tl.y + 1;
-  Pixcol cols[w+1];
-  int x,y;
-  for (x=0; x<w; x++) {
-    Pixcol cx, rv;
-    for (y=0, cx=0, rv=1; y<h; y++, rv<<=1) {
-      switch (get(x+r.tl.x, y+r.tl.y)) {
-      case ' ':           break;
-      case 'o': cx |= rv; break;
-      default: eassert(!"wrong pixel");
-      }
+
+  /* Consequential changes to options */
+
+  if (o_mode & mf_analyse) {
+    if (!o_outmode_kind)
+      o_outmode_kind= (o_flags & ff_printisland) ? omk_none : omk_str;
+
+    if (o_outmode_kind==omk_upload) {
+      o_flags |= ffs_upload;
+      o_outmode_str= "upload";
     }
-    cols[x]= cx;
   }
-  cols[w]= 0;
-
-  int nspaces=0;
-  int ctx=1,i;
-  x=0;
 
-  for (;;) {
-    if (x>w) break;
+  /* Defaults */
+  
+  set_server("YPPSC_PCTB_PCTB",
+	     "http://",          "pctb.ilk.org" /*pctb.crabdance.com*/,
+	                         "pctb.ilk.org",
+	     o_serv_pctb,        o_flags & (ff_needisland|ff_upload));
+	     
+  set_server("YPPSC_PCTB_DICT_UPDATE",
+	     "rsync://",         "rsync.pctb.chiark.greenend.org.uk/pctb",
+	                         "rsync.pctb.chiark.greenend.org.uk/pctb/test",
+	     o_serv_dict_fetch,   o_flags & ff_dict_fetch);
+
+  set_server("YPPSC_PCTB_DICT_SUBMIT",
+	     "http://",           "dictup.pctb.chiark.greenend.org.uk",
+	                          "dictup.pctb.chiark.greenend.org.uk/test",
+	     o_serv_dict_submit,  o_flags & ff_dict_submit);
+
+  if (!o_screenshot_fn)
+    o_screenshot_fn= masprintf("%s/#pages#.ppm",get_vardir());
+
+  /* Actually do the work */
+	     
+  if (o_mode & mf_findwindow) {
+    screenshot_startup();
+    find_yppclient_window();
+  }
+  if (!ocean)  ocean=  o_ocean;
+  if (!pirate) pirate= o_pirate;
+  
+  if (o_flags & ff_needisland) {
+    if (!ocean)
+      badusage("need --ocean option when replaying images"
+	       " (consider supplying --pirate too)");
+    sysassert(! setenv("YPPSC_OCEAN",ocean,1) );
+  }
+  if (pirate && (o_flags & ff_dict_pirate))
+    sysassert(! setenv("YPPSC_PIRATE",pirate,1) );
 
-    if (!cols[x]) {
-      nspaces++;
-      x++;
-      if (nspaces>3) ctx=1;
-      continue;
+  if (o_mode & mf_screenshot) {
+    open_screenshot_file("w");
+    if (o_flags & ff_singlepage) take_one_screenshot();
+    else take_screenshots();
+  }
+  if (o_mode & mf_readscreenshot) {
+    open_screenshot_file("r");
+    if (o_flags & ff_singlepage) read_one_screenshot();
+    else read_screenshots();
+  }
+  if (o_mode & mf_analyse) {
+    if (o_flags & ff_needisland) {
+      find_islandname();
+      if (o_flags & ff_printisland)
+	printf("%s, %s\n", archipelago, island);
     }
-      
-    OCRDatabaseNode *current=0, *lastmatch=0;
-    int startx=x;
-    int afterlastmatchx=-1;
-    current= &ocr_contexts[ctx];
-    for (;;) {
-      if (x>w) break;
-      Pixcol cv= cols[x];
-      for (i=0; i<current->nlinks; i++)
-	if (current->links[i].col == cv)
-	  goto found;
-      /* not found */
-      break;
-    found:
-      x++;
-      current= current->links[i].then;
-      if (current->s[0]) { lastmatch=current; afterlastmatchx=x; }
+    switch (o_outmode_kind) {
+    case omk_upload: case omk_str:   run_analysis();        break;
+    case omk_raw:                    analyse(stdout);       break;
+    case omk_none:                                          break;
+    default: abort();
     }
+  }
+  progress_log("Finished.");
+  return 0;
+}
 
-    if (!lastmatch) {
-      int x2;
-      for (x2=x+1; x2<w && cols[x2]; x2++);
-      printf("UNKNOWN x=%d ctx=%d %d..%d\n",x, ctx, startx,x2);
-      x++;
-    } else {
-      printf("OUTPUT x=%d `%s'\n", x, lastmatch->s);
-      x= afterlastmatchx;
-      ctx= 0;
-    }
+
+
+
+DEFINE_VWRAPPERF(, progress, )
+DEFINE_VWRAPPERF(, progress_log, )
+DEFINE_VWRAPPERF(, progress_spinner, )
+DEFINE_VWRAPPERF(, warning, )
+DEFINE_VWRAPPERF(, fatal, NORET)
+
+static int last_progress_len;
+     
+static void vprogress_core(int spinner, const char *fmt, va_list al) {
+  int r;
+  
+  if (o_quiet) return;
+  if (!isatty(2)) return;
+  
+  if (last_progress_len)
+    putc('\r',stderr);
+
+  r= vfprintf(stderr,fmt,al);
+
+  if (spinner) {
+    putc(spinner,stderr);
+    r++;
+  }
+
+  if (r < last_progress_len) {
+    fprintf(stderr,"%*s", last_progress_len - r, "");
+    if (!r) putc('\r', stderr);
+    else while (last_progress_len-- > r) putc('\b',stderr);
   }
+  last_progress_len= r;
+
+  if (ferror(stderr) || fflush(stderr)) _exit(16);
+}
+   
+void vprogress(const char *fmt, va_list al) { vprogress_core(0,fmt,al); }
+void vprogress_spinner(const char *fmt, va_list al) {
+  static const char spinchars[]="/-\\";
+  static int spinner;
+
+  vprogress_core(spinchars[spinner],fmt,al);
+  spinner++;
+  spinner %= (sizeof(spinchars)-1);
 }
 
-int main(void) {
-  Rect thisr, entryr;
-  int tryrect, colno;
-
-  load_ocr_database();
-  load_image_and_canonify();
-  find_structure();
-
-  for (tryrect= +height; tryrect >= -height; tryrect--) {
-    find_commodity(tryrect, &thisr);
-    if (thisr.tl.x < 0)
-      continue;
-    debug_rect("commod",tryrect, thisr);
-    
-    for (colno=0; colno<MIN_COLUMNS; colno++) {
-      find_table_entry(thisr,colno,&entryr);
-      ocr_rectangle(entryr);
-    }
+void vprogress_log(const char *fmt, va_list al) {
+  if (o_quiet) return;
+  
+  progress("");
+  vfprintf(stderr,fmt,al);
+  putc('\n',stderr);
+  fflush(stderr);
+}
+
+void vwarning(const char *fmt, va_list al) {
+  progress("");
+  fputs("Warning: ",stderr);
+  vfprintf(stderr,fmt,al);
+  fputs("\n",stderr);
+  fflush(stderr);
+}
+
+void vfatal(const char *fmt, va_list al) {
+  progress("");
+  fputs("\n\nFatal error: ",stderr);
+  vfprintf(stderr,fmt,al);
+  fflush(stderr);
+  fputs("\n\n",stderr);
+  _exit(4);
+}
+
+void sysassert_fail(const char *file, int line, const char *what) {
+  int e= errno;
+  progress("");
+  fprintf(stderr,
+	  "\nfatal operational error:\n"
+	  " unsuccessful execution of: %s\n"
+	  " %s:%d: %s\n\n",
+	  what, file,line, strerror(e));
+  _exit(16);
+}
+
+void waitpid_check_exitstatus(pid_t pid, const char *what) { 
+  pid_t got;
+  int st;
+  for (;;) {
+    got= waitpid(pid, &st, 0);
+    if (pid==-1) { sysassert(errno==EINTR); continue; }
+    break;
   }
-  return 0;
+  sysassert( got==pid );
+
+  if (WIFEXITED(st)) {
+    if (WEXITSTATUS(st))
+      fatal("%s failed with nonzero exit status %d",
+	    what, WEXITSTATUS(st));
+  } else if (WIFSIGNALED(st)) {
+    fatal("%s died due to signal %s%s", what,
+	  strsignal(WTERMSIG(st)), WCOREDUMP(st)?" (core dumped)":"");
+  } else {
+    fatal("%s gave strange wait status %d", what, st);
+  }
+}
+
+char *masprintf(const char *fmt, ...) {
+  char *r;
+  va_list al;
+  va_start(al,fmt);
+  sysassert( vasprintf(&r,fmt,al) >= 0);
+  sysassert(r);
+  va_end(al);
+  return r;
 }