X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.c;h=3250d183a940caa8397b75e502ed3237b5303e67;hb=c7280e7f26a6fd3685fe96d94c1d76ec77812e57;hp=950300b588d1cc7e1e7fe9afc5409f0c4084c8d2;hpb=f84da177dd7e293fdc30e095af232cca5d40d82e;p=ypp-sc-tools.db-test.git

diff --git a/pctb/convert.c b/pctb/convert.c
index 950300b..3250d18 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -82,9 +82,6 @@ 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) {
@@ -95,7 +92,7 @@ static void run_analysis(void) {
   analyse(tf);
 
   if (o_flags & ff_upload) {
-    if (o_flags & ff_singlepage)
+    if (npages<=1)
       fatal("Recognition successful, but refusing to upload partial data\n"
 	    " (--single-page specified).  Specify an output mode?");
   }
@@ -130,7 +127,7 @@ void fetch_with_rsync(const char *stem) {
     if (DEBUGP(rsync))
       fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
     execlp(rsync, "rsync",
-	   DEBUGP(rsync) ? "-vLt" : "-Lt",
+	   DEBUGP(rsync) ? "-zvLt" : "-zLt",
 	   "--",remote,local,(char*)0);
     sysassert(!"exec rsync failed");
   }
@@ -198,7 +195,8 @@ int main(int argc, char **argv) {
     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("--edit-charset"))     o_flags |= ff_charset_edit;
+    else if (IS("--no-edit-charset"))  o_flags &= ~(ffm_charset);
     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);
@@ -300,13 +298,15 @@ int main(int argc, char **argv) {
     progress_log("OK for you to move the mouse now.");
   }
   if (o_mode & mf_readscreenshot) {
+    if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
+      badusage("must not reuse screenshots for upload to live PCTB database");
     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(page0_rgbimage);
+      find_islandname(page_images[0]->rgb);
       if (o_flags & ff_printisland)
 	printf("%s, %s\n", archipelago, island);
       sysassert(! setenv("YPPSC_ISLAND",island,1) );