From df798e7f57fac305e26cf1cf6265160ac5219d72 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 23 Jun 2009 00:10:29 +0100 Subject: [PATCH] new --test-servers option --- pctb/README | 2 ++ pctb/convert.c | 15 +++++++++++---- pctb/convert.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pctb/README b/pctb/README index 888d533..9bb9867 100644 --- a/pctb/README +++ b/pctb/README @@ -30,6 +30,8 @@ Options to vary the processing: --edit-charset Enable character set editing. See README.dictionary. --find-island Find and print the ocean and island. Suppresses OCR and output unless used with result processing option. + --test-servers Set default servers to be the test servers, not + the real live ones (doesn't affect explicit settings). Controlling what happens to the results - only one at a time: --upload (default) Upload to the PCTB server diff --git a/pctb/convert.c b/pctb/convert.c index fa9837f..433b043 100644 --- a/pctb/convert.c +++ b/pctb/convert.c @@ -132,7 +132,8 @@ void fetch_with_rsync(const char *stem) { } 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; @@ -142,6 +143,8 @@ static void set_server(const char *envname, const char *defprotocol, value= userspecified; else if ((value= getenv(envname))) ; + else if (o_flags & ff_testservers) + value= defvalue_test; else value= defvalue; @@ -188,6 +191,7 @@ int main(int argc, char **argv) { 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; @@ -234,15 +238,18 @@ int main(int argc, char **argv) { /* 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) diff --git a/pctb/convert.h b/pctb/convert.h index 827c6a7..d38c38e 100644 --- a/pctb/convert.h +++ b/pctb/convert.h @@ -87,6 +87,7 @@ void progress_spinner(const char *fmt, ...) FMT(1,2); enum flags { ff_editcharset= 00001, ff_singlepage= 00002, + ff_testservers= 00004, ff_dict_fetch= 00010, ff_dict_submit= 00020, -- 2.30.2