| Index: trunk/tools/editor_trends/etl/transformer.py |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | class Editor: |
| 52 | | - def __init__(self, editor_id, db_raw, db_dataset, **kwargs): |
| | 52 | + def __init__(self, db_raw, db_dataset, editor_id, **kwargs): |
| 53 | 53 | self.editor_id = editor_id |
| 54 | 54 | self.db_raw = db_raw |
| 55 | 55 | self.db_dataset = db_dataset |
| — | — | @@ -293,11 +293,11 @@ |
| 294 | 294 | |
| 295 | 295 | def transform_editors_multi_launcher(rts): |
| 296 | 296 | tasks = multiprocessing.JoinableQueue() |
| 297 | | - input_db, output_db, editors = setup_database(rts) |
| | 297 | + db_raw, db_dataset, editors = setup_database(rts) |
| 298 | 298 | transformers = [EditorConsumer(rts, tasks) for i in xrange(rts.number_of_processes)] |
| 299 | 299 | |
| 300 | 300 | for editor in editors: |
| 301 | | - tasks.put(Editor(rts.dbname, rts.editors_raw, editor)) |
| | 301 | + tasks.put(Editor(db_raw, db_dataset, editor)) |
| 302 | 302 | |
| 303 | 303 | for x in xrange(rts.number_of_processes): |
| 304 | 304 | tasks.put(None) |