Better arg parsing; also have --raw-tsv mode

diff --git a/pctb/convert.c b/pctb/convert.c
index 291647e79f4c3930fec1d9ae7c9ccb45718f4695..ac3ceb3e44e2bf6910cdc6aa76fbacef24f3369d 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -100,7 +100,7 @@ int main(int argc, char **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"))
@@ -114,6 +114,8 @@ int main(int argc, char **argv) {
       o_single_page= 1;
     else if (!strcmp(arg,"--quiet"))
       o_quiet= 1;
+    else if (!strcmp(arg,"--raw-tsv"))
+      o_outputmode= 0;
     else if (!strcmp(arg,"--upload") ||
             !strcmp(arg,"--arbitrage") ||
             !strcmp(arg,"--tsv") ||
@@ -155,7 +157,10 @@ int main(int argc, char **argv) {
     else read_screenshots();
   }
   if (o_mode & mf_analyse) {
-    run_analysis();
+    if (o_outputmode)
+      run_analysis();
+    else
+      analyse(stdout);
   }
   return 0;
 }

diff --git a/pctb/x.gdb b/pctb/x.gdb
index 3aacfcefe7c4a9c7edc74a2811dd6a74c8186d31..131c503e9eaf2d919debccc704757e513264d326 100644 (file)
--- a/pctb/x.gdb
+++ b/pctb/x.gdb
@@ -1,5 +1,6 @@
-file convert
+file ypp-commodities
 set confirm off
-set args --screenshot-only
-#break pages.c:510
+set args --raw-tsv --same --screenshots-file many-arbitrage-pages.ppm  >t
+watch o_screenshots_fn
+break convert.c:125
 run