Changeset 2613

Show
Ignore:
Timestamp:
09/03/07 05:52:15 (1 year ago)
Author:
athomas
Message:

Updated XML-RPC search module to 0.11. Also fixes #1449.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • xmlrpcplugin/trunk/tracrpc/search.py

    r2609 r2613  
    22from tracrpc.api import IXMLRPCHandler 
    33from tracrpc.util import to_datetime 
    4 from trac.search import ISearchSource 
     4from trac.search.api import ISearchSource 
     5from trac.search.web_ui import SearchModule 
    56 
    67try: 
    …… 
    3132                yield filter 
    3233 
    33     def performSearch(self, req, query, filters = []): 
     34    def performSearch(self, req, query, filters=None): 
    3435        """ Perform a search using the given filters. Defaults to all if not 
    3536            provided. Results are returned as a list of tuples in the form 
    3637           (href, title, date, author, excerpt).""" 
    37         from trac.Search import search_terms 
    38         query = search_terms(query) 
    39         chosen_filters = set(filters) 
     38        query = SearchModule(self.env)._get_search_terms(query) 
     39        filters_provided = filters is not None 
     40        chosen_filters = set(filters or []) 
    4041        available_filters = [] 
    4142        for source in self.search_sources: 
    …… 
    4445        filters = [f[0] for f in available_filters if f[0] in chosen_filters] 
    4546        if not filters: 
     47            if filters_provided: 
     48                return [] 
    4649            filters = [f[0] for f in available_filters] 
    4750        self.env.log.debug("Searching with %s" % filters)