Changeset 477

Show
Ignore:
Timestamp:
03/10/06 20:37:53 (3 years ago)
Author:
root
Message:

XmlRpcPlugin:

  • Synced RPC search with trunk changes
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • xmlrpcplugin/0.9/tracrpc/search.py

    r246 r477  
    22from tracrpc.api import IXMLRPCHandler 
    33from trac.Search import ISearchSource 
    4 from trac.web.api import absolute_url 
    54 
    65try: 
    …… 
    3534            provided. Results are returned as a list of tuples in the form 
    3635           (href, title, date, author, excerpt).""" 
     36        from trac.Search import search_terms 
     37        query = search_terms(query) 
    3738        chosen_filters = set(filters) 
    3839        available_filters = [] 
    …… 
    4041            available_filters += source.get_search_filters(req) 
    4142 
    42         filters = [f[0] for f in available_filters if f in chosen_filters] 
     43        filters = [f[0] for f in available_filters if f[0] in chosen_filters] 
    4344        if not filters: 
    4445            filters = [f[0] for f in available_filters] 
     46        self.env.log.debug("Searching with %s" % filters) 
    4547 
    46         return [['/'.join(req.base_url.split('/')[0:3]) + result[0]] + list(result[1:]) \ 
    47             for result in source.get_search_results(req, query, filters) \ 
    48                 for source in self.search_sources] 
     48        results = [] 
     49        for source in self.search_sources: 
     50            for result in source.get_search_results(req, query, filters): 
     51                results.append(['/'.join(req.base_url.split('/')[0:3]) 
     52                                + result[0]] + list(result[1:])) 
     53        return results