chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename yppsc-ocr-resolver to dictionary-manager, and database and charset to dictiona...
[ypp-sc-tools.db-test.git]
/
pctb
/
convert.c
diff --git
a/pctb/convert.c
b/pctb/convert.c
index 291647e79f4c3930fec1d9ae7c9ccb45718f4695..4cc45b4a7981d09821b76136490fad3bf5c3bb83 100644
(file)
--- a/
pctb/convert.c
+++ b/
pctb/convert.c
@@
-47,11
+47,12
@@
static enum {
mode_all= 0111,
} o_mode= mode_all;
mode_all= 0111,
} o_mode= mode_all;
-static char *o_screenshot
s
_fn;
+static char *o_screenshot_fn;
static int o_single_page, o_quiet;
static const char *o_outputmode= "upload";
static int o_single_page, o_quiet;
static const char *o_outputmode= "upload";
-FILE *screenshots_file;
+const char *o_resolver;
+FILE *screenshot_file;
static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
@@
-63,11
+64,11
@@
static void vbadusage(const char *fmt, va_list al) {
}
DEFINE_VWRAPPERF(static, badusage, NORET);
}
DEFINE_VWRAPPERF(static, badusage, NORET);
-static void open_screenshot
s
_file(const char *mode) {
- screenshot
s_file= fopen(o_screenshots
_fn, mode);
- if (!screenshot
s
_file)
+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",
fatal("could not open screenshots file `%s': %s",
- o_screenshot
s
_fn, strerror(errno));
+ o_screenshot_fn, strerror(errno));
}
static void run_analysis(void) {
}
static void run_analysis(void) {
@@
-77,6
+78,10
@@
static void run_analysis(void) {
progress("running recognition...");
analyse(tf);
progress("running recognition...");
analyse(tf);
+ if (o_single_page && !strcmp(o_outputmode,"upload"))
+ fatal("Recognition successful, but refusing to upload partial data\n"
+ " (--single-page specified). Specify an output mode?");
+
sysassert( fseek(tf,0,SEEK_SET) == 0);
progress_log("processing results (--%s)...", o_outputmode);
sysassert( fseek(tf,0,SEEK_SET) == 0);
progress_log("processing results (--%s)...", o_outputmode);
@@
-100,7
+105,7
@@
int main(int argc, char **argv) {
int r;
#define ARGVAL ((*++argv) ? *argv : \
int r;
#define ARGVAL ((*++argv) ? *argv : \
-
badusage("missing value for option %s",arg),(char*)0
)
+
(badusage("missing value for option %s",arg),(char*)0)
)
while ((arg=*++argv)) {
if (!strcmp(arg,"--find-window-only"))
while ((arg=*++argv)) {
if (!strcmp(arg,"--find-window-only"))
@@
-110,17
+115,23
@@
int main(int argc, char **argv) {
else if (!strcmp(arg,"--analyse-only") ||
!strcmp(arg,"--same"))
o_mode= mode_analyse;
else if (!strcmp(arg,"--analyse-only") ||
!strcmp(arg,"--same"))
o_mode= mode_analyse;
+ else if (!strcmp(arg,"--everything"))
+ o_mode= mode_all;
else if (!strcmp(arg,"--single-page"))
o_single_page= 1;
else if (!strcmp(arg,"--quiet"))
o_quiet= 1;
else if (!strcmp(arg,"--single-page"))
o_single_page= 1;
else if (!strcmp(arg,"--quiet"))
o_quiet= 1;
+ else if (!strcmp(arg,"--edit-dictionary"))
+ o_resolver= "./dictionary-manager";
+ else if (!strcmp(arg,"--raw-tsv"))
+ o_outputmode= 0;
else if (!strcmp(arg,"--upload") ||
!strcmp(arg,"--arbitrage") ||
!strcmp(arg,"--tsv") ||
!strcmp(arg,"--best-prices"))
o_outputmode= arg+2;
else if (!strcmp(arg,"--upload") ||
!strcmp(arg,"--arbitrage") ||
!strcmp(arg,"--tsv") ||
!strcmp(arg,"--best-prices"))
o_outputmode= arg+2;
- else if (!strcmp(arg,"--screenshot
s
-file"))
- o_screenshot
s
_fn= ARGVAL;
+ else if (!strcmp(arg,"--screenshot-file"))
+ o_screenshot_fn= ARGVAL;
#define DF(f) \
else if (!strcmp(arg,"-D" #f)) \
debug_flags |= dbg_##f;
#define DF(f) \
else if (!strcmp(arg,"-D" #f)) \
debug_flags |= dbg_##f;
@@
-135,8
+146,8
@@
int main(int argc, char **argv) {
badusage("unknown option `%s'",arg);
}
badusage("unknown option `%s'",arg);
}
- if (!o_screenshot
s
_fn) {
- r= asprintf(&o_screenshot
s
_fn,"%s/#pages#.ppm",get_vardir());
+ if (!o_screenshot_fn) {
+ r= asprintf(&o_screenshot_fn,"%s/#pages#.ppm",get_vardir());
sysassert(r>=0);
}
sysassert(r>=0);
}
@@
-145,17
+156,21
@@
int main(int argc, char **argv) {
find_yppclient_window();
}
if (o_mode & mf_screenshot) {
find_yppclient_window();
}
if (o_mode & mf_screenshot) {
- open_screenshot
s
_file("w");
+ open_screenshot_file("w");
if (o_single_page) take_one_screenshot();
else take_screenshots();
}
if (o_mode & mf_readscreenshot) {
if (o_single_page) take_one_screenshot();
else take_screenshots();
}
if (o_mode & mf_readscreenshot) {
- open_screenshot
s
_file("r");
+ open_screenshot_file("r");
if (o_single_page) read_one_screenshot();
else read_screenshots();
}
if (o_mode & mf_analyse) {
if (o_single_page) read_one_screenshot();
else read_screenshots();
}
if (o_mode & mf_analyse) {
- run_analysis();
+ find_islandname();
+ if (o_outputmode)
+ run_analysis();
+ else
+ analyse(stdout);
}
return 0;
}
}
return 0;
}
@@
-244,19
+259,6
@@
void sysassert_fail(const char *file, int line, const char *what) {
_exit(16);
}
_exit(16);
}
-void *mmalloc(size_t sz) {
- void *r;
- if (!sz) return 0;
- sysassert( r= malloc(sz) );
- return r;
-}
-void *mrealloc(void *p, size_t sz) {
- assert(sz);
- void *r;
- sysassert( r= realloc(p,sz) );
- return r;
-}
-
void waitpid_check_exitstatus(pid_t pid, const char *what) {
pid_t got;
int st;
void waitpid_check_exitstatus(pid_t pid, const char *what) {
pid_t got;
int st;