diff options
Diffstat (limited to 'servo/urls/search.py')
| -rw-r--r-- | servo/urls/search.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/servo/urls/search.py b/servo/urls/search.py index 06278d6..d47d7aa 100644 --- a/servo/urls/search.py +++ b/servo/urls/search.py @@ -1,19 +1,20 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.decorators.cache import cache_page from servo.views.search import search_gsx, get_gsx_search_results -urlpatterns = patterns( - "servo.views.search", - url(r'^$', "spotlight", name="search-spotlight"), - url(r'^customers/$', "customers", name="search-customers"), +from servo.views.search import * + +urlpatterns = [ + url(r'^$', spotlight, name="search-spotlight"), + url(r'^customers/$', customers, name="search-customers"), url(r'^devices/(?P<what>\w+)/(?P<param>\w+)/(?P<query>[~\w\s,\-\(\)/\.]+)/$', - "search_gsx", + search_gsx, name="search-search_gsx"), url(r'^gsx/(?P<what>\w+)/(?P<param>\w+)/(?P<query>[~\w\s,\-\(\)/\.]+)/$', #cache_page(60*15)(get_gsx_search_results), get_gsx_search_results, name="search-get_gsx_search_results"), -) +] |