summaryrefslogtreecommitdiff
path: root/chimere/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/urls.py')
-rw-r--r--chimere/urls.py20
1 files changed, 19 insertions, 1 deletions
diff --git a/chimere/urls.py b/chimere/urls.py
index 164ef68..28a7098 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2014 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -68,6 +68,22 @@ if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \
'route', name="route"),
)
+if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \
+ and settings.CHIMERE_SEARCH_ENGINE:
+ from chimere.forms import SearchForm
+ from chimere.views import SearchView
+ from haystack.views import search_view_factory
+ urlpatterns += patterns('chimere.views',
+ url(r'^search/?$', search_view_factory(
+ view_class=SearchView,
+ template='search/search.html',
+ form_class=SearchForm
+ ), name='haystack_search'),
+ url(r'^search/autocomplete/$', 'autocomplete',
+ name='autocomplete-search')
+ )
+ #urlpatterns += [url(r'^search/', include('haystack.urls')),]
+
urlpatterns += patterns('chimere.views',
url(r'^charte/?$', 'charte', name="charte"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', 'contactus',
@@ -87,6 +103,8 @@ urlpatterns += patterns('chimere.views',
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getGeoObjects/'\
r'(?P<category_ids>[a-zA-Z0-9_-]+)(/(?P<status>\w+))?$', 'getGeoObjects',
name="getgeoobjects"),
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?get-marker/'\
+ r'(?P<pk>[0-9]+)$', 'getMarker', name="get-marker"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$',
'get_available_categories', name="get_categories"),
url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAllCategories/$',