Remove get_report_filters() function. Let reports define the filter options themselves.

svn: r8315

src/PluginUtils/_Options.py

@@ -381,16 +381,6 @@ class OptionHandler:
     def save_common_options(self):
         pass
 
-    def get_filter_number(self):
-        if self.default_options_dict.has_key('filter'):
-            return self.options_dict.get('filter',
-                    self.default_options_dict['filter'])
-        else:
-            return None
-
-    def set_filter_number(self,val):
-        self.options_dict['filter'] = val
-
     def get_person_id(self):
         return self.person_id
 
@@ -457,13 +447,7 @@ class Options:
         Enables semi-common options for this module.
         
         The semi-common option is the option which GRAMPS is aware of,
-        but not common enough to be present in all modules. Here's the list
-        of possible keys for semi-commons:
-        
-            'filter'    - Filter number, selected among filters
-                          available for this module. If defined,
-                          get_module_filters() method must be defined
-                          which returns the list of available filters.
+        but not common enough to be present in all modules.
 
         A self.enable_dict dictionary MUST be defined here, whose keys
         are the valid semi-common keys above, and whose values are the
@@ -508,11 +492,3 @@ class Options:
                 in the add_user_options() method above.
         """
         pass
-    
-    def get_filter_number(self):
-        """
-        Return number of a filter to use.
-        
-        This method MUST NOT be overridden by subclasses.
-        """
-        return self.handler.get_filter_number()

src/PluginUtils/_Tool.py

@@ -173,7 +173,6 @@ class CommandLineTool:
 
         self.options_help = {
             'id'        : ["=ID","Gramps ID of a central person."],
-            'filter'    : ["=num","Filter number."],
             }
 
         if noopt:
@@ -209,18 +208,6 @@ class CommandLineTool:
         self.options_help['id'].append(id_list)
         self.options_help['id'].append(False)
 
-        if self.options_dict.has_key('filter'):
-            filter_num = self.options_dict['filter']
-            self.filters = self.option_class.get_report_filters(self.person)
-            self.option_class.handler.set_filter_number(filter_num)
-            
-            filt_list = [ filt.get_name() for filt in self.filters ]
-            cust_filt_list = [ filt2.get_name() for filt2 in 
-                               CustomFilters.get_filters() ]
-            filt_list.extend(cust_filt_list)
-            self.options_help['filter'].append(filt_list)
-            self.options_help['filter'].append(True)
-
     def show_options(self):
         if not self.show:
             return