| Index: trunk/tools/editor_trends/manage.py |
| — | — | @@ -26,11 +26,8 @@ |
| 27 | 27 | from argparse import RawTextHelpFormatter |
| 28 | 28 | import ConfigParser |
| 29 | 29 | |
| 30 | | - |
| 31 | 30 | import configuration |
| 32 | | -import config |
| 33 | 31 | from utils import file_utils |
| 34 | | - |
| 35 | 32 | from utils import ordered_dict |
| 36 | 33 | from utils import log |
| 37 | 34 | from utils import timer |
| — | — | @@ -41,10 +38,9 @@ |
| 42 | 39 | from etl import store |
| 43 | 40 | from etl import sort |
| 44 | 41 | from etl import transformer |
| | 42 | +from analyses import analyzer |
| 45 | 43 | |
| 46 | | -from analyses import count_editors |
| 47 | 44 | |
| 48 | | - |
| 49 | 45 | def show_choices(settings, attr): |
| 50 | 46 | choices = getattr(settings, attr).items() |
| 51 | 47 | choices.sort() |
| — | — | @@ -200,7 +196,11 @@ |
| 201 | 197 | # dbname=properties.full_project, |
| 202 | 198 | # collection=properties.collection) |
| 203 | 199 | print 'Dataset is created by: %s' % target |
| 204 | | - count_editors.generate_chart_data(properties.project, properties.collection, target) |
| | 200 | + |
| | 201 | + analyzer.generate_chart_data(properties.project, |
| | 202 | + properties.collection, |
| | 203 | + properties.language_code, |
| | 204 | + target) |
| 205 | 205 | stopwatch.elapsed() |
| 206 | 206 | log.log_to_mongo(properties, 'dataset', 'export', stopwatch, event='finish') |
| 207 | 207 | |
| — | — | @@ -424,7 +424,7 @@ |
| 425 | 425 | |
| 426 | 426 | parser.add_argument('-d', '--datasets', |
| 427 | 427 | action='store', |
| 428 | | - choices=count_editors.available_analyses(), |
| | 428 | + choices=analyzer.available_analyses(), |
| 429 | 429 | help='Indicate what type of data should be exported.', |
| 430 | 430 | default='cohort_dataset_backward_bar') |
| 431 | 431 | |