diff -r 8ff4fd1a6e9c -r 7070d3acc3d4 web/hdalab/management/commands/query_category_inclusion.py --- a/web/hdalab/management/commands/query_category_inclusion.py Tue Jul 03 17:50:26 2012 +0200 +++ b/web/hdalab/management/commands/query_category_inclusion.py Wed Jul 04 10:31:59 2012 +0200 @@ -38,11 +38,6 @@ dest='force', default=False, help='ask no questions'), - make_option('--random', - action='store_true', - dest='random', - default=False, - help='randomize query on categories'), make_option('--site', action='store', type='string', @@ -117,28 +112,21 @@ site_url = options.get('site_url', settings.WIKIPEDIA_API_URL) - random = options.get('random', False) - types_mask = 0 if self.verbosity > 2: print "option passed : " + repr(options) - queryset = WpCategory.objects + queryset = WpCategory.objects.filter(tags__hidden = False).distinct() cat_list = options.get("category", []); if cat_list: queryset = queryset.filter(label__in=cat_list) elif not options.get('all',False): - queryset = queryset.annotate(wpc=Count('child_categories')).filter(wpc = 0) - #else: - # queryset = Tag.objects.filter(url_status=None) + queryset = queryset.annotate(wpc=Count('child_categories')).filter(wpc = 0) - if random: - queryset = queryset.order_by("?") - else: - queryset = queryset.order_by("label") + queryset = queryset.order_by("label") if limit >= 0: queryset = queryset[start:limit]