Changeset 8360

Timestamp:

20/06/12 10:53:00 (9 years ago)

Author:

mnagni

Message:

The _packResult "missed" the first result
The view built a wrong hostURL

Location:

mauRepo/HPFos/trunk/src/HPFos

Files:

• osImpl/myimpl.py (modified) (1 diff)
• view/view.py (modified) (3 diffs)

mauRepo/HPFos/trunk/src/HPFos/osImpl/myimpl.py

@@ -239 +239 @@
         super(MyOSQuery, self).__init__(params)
 
-    def _packResult(self, results, id = None, **kwargs):
+    def _packResult(self, results, **kwargs):
         subresults = []
 
         step = calculateStep(**kwargs)
 
-        startIndex = self.indexOffset
+        startIndex = self.indexOffset - 1
         if kwargs['params_values'].has_key('startIndex'):
             if int(kwargs['params_values']['startIndex']) < len(results):

mauRepo/HPFos/trunk/src/HPFos/view/view.py

@@ -60 +60 @@
 
 def getDescription(request, collection_guid = None, observation_guid = None, result_guid = None):
-    ospath = _buildDescriptionOsPath(collection_guid, observation_guid, result_guid)
+    hostURL = _buildHostURL(request)
+    ospath = _buildDescriptionOsPath(hostURL, collection_guid, observation_guid, result_guid)
     response = os_engine.getDescription(ospath)
     context = {}
@@ -67 +68 @@
 
 def _doSearch(request, iformat, collection_guid = None, observation_guid = None, result_guid = None):
-    host = _buildHostURL(request)   
+    hostURL = _buildHostURL(request)   
     #params = {'q': ['ice', 'snow']}
     params = request.GET.copy()
@@ -94 +95 @@
     return _doSearch(request, iformat, collection_guid, observation_guid, result_guid)   
 
-def _buildDescriptionOsPath(collection_guid = None, observation_guid = None, result_guid = None):
+def _buildDescriptionOsPath(hostURL, collection_guid = None, observation_guid = None, result_guid = None):
     ospath = "%s/search/" % (hostURL)
     if collection_guid: