}
static void set_server(const char *envname, const char *defprotocol,
- const char *defvalue, const char *userspecified,
+ const char *defvalue, const char *defvalue_test,
+ const char *userspecified,
int enable) {
const char *value;
value= userspecified;
else if ((value= getenv(envname)))
;
+ else if (o_flags & ff_testservers)
+ value= defvalue_test;
else
value= defvalue;
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;
/* 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) {
+ if (o_flags & ff_printisland) {
+ o_outmode_kind= omk_none;
+ o_flags |= ff_singlepage;
+ } else {
+ o_outmode_kind= omk_str;
+ }
+ }
if (o_outmode_kind==omk_upload) {
o_flags |= ffs_upload;
/* Defaults */
set_server("YPPSC_PCTB_PCTB",
- "http://", "pctb.ilk.org",
- o_serv_pctb, o_flags & (ff_needisland|ff_upload));
+ "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://", "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)
if (!ocean) ocean= o_ocean;
if (!pirate) pirate= o_pirate;
- if (o_flags & ff_needisland) {
+ if (o_flags & ff_needisland)
if (!ocean)
badusage("need --ocean option when replaying images"
" (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) );
open_screenshot_file("w");
if (o_flags & ff_singlepage) take_one_screenshot();
else take_screenshots();
+ progress_log("OK for you to move the mouse now.");
}
if (o_mode & mf_readscreenshot) {
open_screenshot_file("r");
}
if (o_mode & mf_analyse) {
if (o_flags & ff_needisland) {
- find_islandname();
+ find_islandname(page0_rgbimage);
if (o_flags & ff_printisland)
printf("%s, %s\n", archipelago, island);
}