From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 7 Jun 2009 21:58:40 +0000 (+0100)
Subject: Better arg parsing; also have --raw-tsv mode
X-Git-Tag: 1.9.2~141
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=8b296a5f4da05a4dcf356f71e1ce4e63d8d282cf;hp=01ec5abd4e3a712ddfc58e37e4bbc01a9b8493f5

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

diff --git a/pctb/convert.c b/pctb/convert.c
index 291647e..ac3ceb3 100644
--- 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 3aacfce..131c503 100644
--- 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