Project

General

Profile

« Previous | Next » 

Revision 662

Added by Aaron Marcuse-Kubitza about 13 years ago

bin/map: Added verbose and debug options. Added initial debug info.

View differences:

map
26 26
27 27 
    env_names = []
28 28 
    def usage_err():
29 
        raise SystemExit('Usage: '+opts.env_usage(env_names, True)+' [commit=1]'
30 
            ' [test=1] '+sys.argv[0]+' [map_path...] [<input] [>output]')
29 
        raise SystemExit('Usage: ' + opts.env_usage(env_names, True)
30 
            +' [commit=1] [test=1] [verbose=1] [debug=1] '+sys.argv[0]
31 
            +' [map_path...] [<input] [>output]')
31 32 
    limit = opts.get_env_var('n', None, env_names)
32 33 
    if limit != None: limit = int(limit)
33 34 
    test = opts.env_flag('test')
34 35 
    commit = not test and opts.env_flag('commit') # never commit in test mode
36 
    debug = opts.env_flag('debug')
37 
    verbose = debug or opts.env_flag('verbose')
35 38
39 
    def log(msg, on=verbose):
40 
        if on: sys.stderr.write(msg)
41 
    def log_start(action, on=verbose): log(action+'...')
42 
    def log_done(on=verbose): log('Done\n')
43
36 44 
    # Get db config from env vars
37 45 
    db_config_names = ['engine', 'host', 'user', 'password', 'database']
38 46 
    def get_db_config(prefix):
......
49 57 
        else: map_paths = [None]
50 58
51 59 
    def connect_db(db_config):
52 
        sys.stderr.write('Connecting to '+sql.db_config_str(db_config)+'...')
60 
        log_start('Connecting to '+sql.db_config_str(db_config))
53 61 
        db = sql.connect(db_config)
54 
        sys.stderr.write('Done\n')
62 
        log_done()
55 63 
        return db
56 64
57 65 
    def process_input(root, process_row, map_path):
......
100 108 
                row_id = str(i)
101 109 
                for in_, out in mappings:
102 110 
                    value = metadata_value(in_)
103 
                    if value == None: value = get_value(in_, row)
111 
                    if value == None:
112 
                        log_start('Getting '+str(in_), debug)
113 
                        value = get_value(in_, row)
114 
                        log_done(debug)
104 115 
                    if value != None:
105 116 
                        xpath.put_obj(root, out, row_id, has_types, value)
106 117 
                process_row(row)

Also available in: Unified diff