Revamp machinery for lookup up ships in chat log tracker

[ypp-sc-tools.db-test.git] / yoweb-scrape

diff --git a/yoweb-scrape b/yoweb-scrape
index 841430b6e6ac6b8256db5ab47f9f5d2e3f36763c..720e886769131f60d64f854f9b26576a5d4ffe86 100755 (executable)
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -39,7 +39,7 @@ max_pirate_namelen = 12
 
 def debug(m):
        if opts.debug > 0:
 
 def debug(m):
        if opts.debug > 0:

-               print m
+               print >>opts.debug_file, m

 
 def format_time_interval(ti):
        if ti < 120: return '%d:%02d' % (ti / 60, ti % 60)
 
 def format_time_interval(ti):
        if ti < 120: return '%d:%02d' % (ti / 60, ti % 60)


@@ -917,7 +917,7 @@ display modes (for --display) apply to ship-aid:
                help='cache yoweb pages in DIR')
        ao('-D','--debug', action='count', dest='debug', default=0,
                help='enable debugging output')
                help='cache yoweb pages in DIR')
        ao('-D','--debug', action='count', dest='debug', default=0,
                help='enable debugging output')

-       ao('--debug-fd', action='count', dest='debug_fd',
+       ao('--debug-fd', type='int', dest='debug_fd',

                help='write any debugging output to specified fd')
        ao('-q','--quiet', action='store_true', dest='quiet',
                help='suppress warning output')
                help='write any debugging output to specified fd')
        ao('-q','--quiet', action='store_true', dest='quiet',
                help='suppress warning output')


@@ -937,7 +937,9 @@ display modes (for --display) apply to ship-aid:
                pa.error('need a mode argument')
 
        if opts.debug_fd is not None:
                pa.error('need a mode argument')
 
        if opts.debug_fd is not None:

-               opts.debug_file = fdopen(opts.debug_fd, 'w')
+               opts.debug_file = os.fdopen(opts.debug_fd, 'w')
+       else:
+               opts.debug_file = sys.stdout

 
        mode = args[0]
        mode_fn_name = 'do_' + mode.replace('_','#').replace('-','_')
 
        mode = args[0]
        mode_fn_name = 'do_' + mode.replace('_','#').replace('-','_')