more search nixing

bookshare/settings/urls.py

@@ -3,10 +3,6 @@ from django.views.generic import TemplateView
 
 from django.contrib import admin
 
-# FIX SEARCH #
-#from core.forms import StyledSearchForm
-from haystack.views import SearchView
-
 # Uncomment the next two lines to enable the admin:
 admin.autodiscover()
 
@@ -26,26 +22,11 @@ urlpatterns = patterns('',
     url(r'^privacy/?$', TemplateView.as_view(template_name='privacy.html'), name='privacy'),
     url(r'^privacy/opt-out/?$', 'core.views.privacy_opt_out', name='privacy_opt_out'),
 
-    #### LISTING PAGES ####
-    # book listing page
-    url(r'^listings/(?P<book_id>\d+)$', 'trades.views.view_listing', name = 'view_listing'),
-
-    #### SEARCH PAGES ####
-    # points to a SearchView Instance
-    #url(r'^search/', include('haystack.urls')),
-    #url(
-    #    r'^search/?',
-    #    SearchView(
-    #        form_class = StyledSearchForm,
-    #        results_per_page = 20,
-    #    ),
-    #    name = 'haystack_search',
-    #),
-
+    ### user authentication ###
     url(r'^login/$', 'cas.views.login', name='login'),
     url(r'^logout/$', 'cas.views.logout', name='logout'),
 
-    #### ADMIN PAGES ####
+    #### admin pages ####
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),