X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fconvert.c;h=950300b588d1cc7e1e7fe9afc5409f0c4084c8d2;hp=3bc7554525e9299968c26196bb19ad1f23b420d8;hb=e8489d4711c4cc773f6e5f315f3799027e824f91;hpb=49e1be1a94ba3dc9d951056ebec2784286d3e928

diff --git a/pctb/convert.c b/pctb/convert.c
index 3bc7554..950300b 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -37,16 +37,18 @@ const char *get_libdir(void) { return "."; }
 
 
 enum mode {
-  mf_findwindow=      0001,
-  mf_screenshot=      0010,
-  mf_readscreenshot=  0020,
-  mf_analyse=         0100,
+  mf_findwindow=      00001,
+  mf_screenshot=      00010,
+  mf_readscreenshot=  00020,
+  mf_analyse=         00100,
+  mfm_special=        07000,
   
-  mode_findwindow=    0001,
-  mode_screenshot=    0011,
-  mode_analyse=       0120,
+  mode_findwindow=    00001,
+  mode_screenshot=    00011,
+  mode_analyse=       00120,
+  mode_showcharset=   01000,
 
-  mode_all=           0111,
+  mode_all=           00111,
 };
 
 enum outmodekind {
@@ -80,6 +82,9 @@ static void open_screenshot_file(const char *mode) {
   if (!screenshot_file)
     fatal("could not open screenshots file `%s': %s",
 	  o_screenshot_fn, strerror(errno));
+
+  if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
+    badusage("must not reuse screenshots for upload to live PCTB database");
 }
 
 static void run_analysis(void) {
@@ -122,6 +127,8 @@ void fetch_with_rsync(const char *stem) {
     const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
     char *remote= masprintf("%s/master-%s.txt", src, stem);
     char *local= masprintf("#master-%s#.txt", stem);
+    if (DEBUGP(rsync))
+      fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
     execlp(rsync, "rsync",
 	   DEBUGP(rsync) ? "-vLt" : "-Lt",
 	   "--",remote,local,(char*)0);
@@ -184,6 +191,7 @@ int main(int argc, char **argv) {
   while ((arg=*++argv)) {
     if (IS("--find-window-only"))      o_mode= mode_findwindow;
     else if (IS("--screenshot-only"))  o_mode= mode_screenshot;
+    else if (IS("--show-charset"))     o_mode= mode_showcharset;
     else if (IS("--analyse-only") ||
 	     IS("--same"))             o_mode= mode_analyse;
     else if (IS("--everything"))       o_mode= mode_all;
@@ -231,7 +239,7 @@ int main(int argc, char **argv) {
 	o_outmode_kind= omk_none;
 	o_flags |= ff_singlepage;
       } else {
-	o_outmode_kind= omk_str;
+	o_outmode_kind= omk_upload;
       }
     }
 
@@ -272,13 +280,19 @@ int main(int argc, char **argv) {
   
   if (o_flags & ff_needisland)
     if (!ocean)
-      badusage("need --ocean option when replaying images"
+      badusage("need --ocean option when not using actual YPP client window"
 	       " (consider supplying --pirate too)");
   if (ocean)
     sysassert(! setenv("YPPSC_OCEAN",ocean,1) );
   if (pirate && (o_flags & ff_dict_pirate))
     sysassert(! setenv("YPPSC_PIRATE",pirate,1) );
 
+  switch (o_mode & mfm_special) {
+  case 0:                                      break;
+  case mode_showcharset:  ocr_showcharsets();  exit(0);
+  default:                                     abort();
+  }
+
   if (o_mode & mf_screenshot) {
     open_screenshot_file("w");
     if (o_flags & ff_singlepage) take_one_screenshot();
@@ -295,6 +309,7 @@ int main(int argc, char **argv) {
       find_islandname(page0_rgbimage);
       if (o_flags & ff_printisland)
 	printf("%s, %s\n", archipelago, island);
+      sysassert(! setenv("YPPSC_ISLAND",island,1) );
     }
     switch (o_outmode_kind) {
     case omk_upload: case omk_str:   run_analysis();        break;