Changeset 8557

Timestamp:

06/09/12 22:15:46 (7 years ago)

Author:

mnagni

Message:

Incomplete - # 22551: List resources / display single file
 http://team.ceda.ac.uk/trac/ceda/ticket/22551

Location:

mauRepo/HPFos/trunk/hpfos/HPFos

Files:

• moles3epb.py (modified) (2 diffs)
• osImpl/myimpl.py (modified) (3 diffs)

mauRepo/HPFos/trunk/hpfos/HPFos/moles3epb.py

@@ -123 +123 @@
     def _filter_bbox(self, collections, bbox):
         if bbox is None:
-            collections 
+            return collections 
         res = []
         for collection in collections:
@@ -158 +158 @@
                         res.append(collection)
                         break
+        return res
 
     def retrieveGUIDFromInstance(self, instance):

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

@@ -227 +227 @@
             return self._digest_fatcat_atom(context, results)                    
 
-        count, start_index, start_page = self._importCountAndPage(context)        
+        count, start_index, start_page = self._importCountAndPage(context) 
+        tot_results = len(results)       
         # This check is a trick to speed up the response when no query parameter 
         # is required (all parameters are None). In this case the results are paged first 
@@ -241 +242 @@
         else:
             filtered = self.apply_query_params(context, results)
-            subresults = filter_results(filtered, count, start_index, start_page) 
-                                            
-        tot_results = len(subresults)        
+            subresults = filter_results(filtered, count, start_index, start_page)
+            tot_results = len(subresults)                                             
+                
         return Result(count, start_index, start_page, tot_results, \
                       subresult = subresults, title=HPFOS_TITLE)
@@ -461 +462 @@
         if not context.has_key(GUID) or context[GUID] is None:
             return context['moles3EPB'].getObservationCollections(bbox = ibbox, 
-                                                                  keywords = context['q'])        
+                                                                keywords = context['q'], 
+                                                                start = context['start'], 
+                                                                end = context['stop'])        
               
         obj = context['moles3EPB'].getInstanceFromGUID(context[GUID])