Changeset 8360
- Timestamp:
- 20/06/12 10:53:00 (9 years ago)
- Location:
- mauRepo/HPFos/trunk/src/HPFos
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/HPFos/trunk/src/HPFos/osImpl/myimpl.py
r8355 r8360 239 239 super(MyOSQuery, self).__init__(params) 240 240 241 def _packResult(self, results, id = None,**kwargs):241 def _packResult(self, results, **kwargs): 242 242 subresults = [] 243 243 244 244 step = calculateStep(**kwargs) 245 245 246 startIndex = self.indexOffset 246 startIndex = self.indexOffset - 1 247 247 if kwargs['params_values'].has_key('startIndex'): 248 248 if int(kwargs['params_values']['startIndex']) < len(results): -
mauRepo/HPFos/trunk/src/HPFos/view/view.py
r8357 r8360 60 60 61 61 def getDescription(request, collection_guid = None, observation_guid = None, result_guid = None): 62 ospath = _buildDescriptionOsPath(collection_guid, observation_guid, result_guid) 62 hostURL = _buildHostURL(request) 63 ospath = _buildDescriptionOsPath(hostURL, collection_guid, observation_guid, result_guid) 63 64 response = os_engine.getDescription(ospath) 64 65 context = {} … … 67 68 68 69 def _doSearch(request, iformat, collection_guid = None, observation_guid = None, result_guid = None): 69 host = _buildHostURL(request)70 hostURL = _buildHostURL(request) 70 71 #params = {'q': ['ice', 'snow']} 71 72 params = request.GET.copy() … … 94 95 return _doSearch(request, iformat, collection_guid, observation_guid, result_guid) 95 96 96 def _buildDescriptionOsPath( collection_guid = None, observation_guid = None, result_guid = None):97 def _buildDescriptionOsPath(hostURL, collection_guid = None, observation_guid = None, result_guid = None): 97 98 ospath = "%s/search/" % (hostURL) 98 99 if collection_guid:
Note: See TracChangeset
for help on using the changeset viewer.