Author: matevz
Date: Wed Mar 27 14:55:01 2013
New Revision: 1461623
URL: http://svn.apache.org/r1461623
Log:
fix for bhsearch crashing sporadically
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/web_ui.py
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/web_ui.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/web_ui.py?rev=1461623&r1=1461622&r2=1461623&view=diff
==============================================================================
---
bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/web_ui.py
(original)
+++
bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/web_ui.py
Wed Mar 27 14:55:01 2013
@@ -337,14 +337,15 @@ class BloodhoundSearchModule(Component):
return handler
def post_process_request(self, req, template, data, content_type):
- if self.redirect_enabled:
- data['search_handler'] = req.href.bhsearch()
- elif req.path_info.startswith(SEARCH_URL):
- data['search_handler'] = req.href.search()
- elif self.default_search or req.path_info.startswith(BHSEARCH_URL):
- data['search_handler'] = req.href.bhsearch()
- else:
- data['search_handler'] = req.href.search()
+ if data is not None:
+ if self.redirect_enabled:
+ data['search_handler'] = req.href.bhsearch()
+ elif req.path_info.startswith(SEARCH_URL):
+ data['search_handler'] = req.href.search()
+ elif self.default_search or req.path_info.startswith(BHSEARCH_URL):
+ data['search_handler'] = req.href.bhsearch()
+ else:
+ data['search_handler'] = req.href.search()
return template, data, content_type
