Changeset 8643 for mauRepo

Timestamp:

19/10/12 09:40:16 (7 years ago)

Author:

mnagni

Message:

Incomplete - # 22576: Filtering on Files in a particular Result returns all Files rather than a subset.
 http://team.ceda.ac.uk/trac/ceda/ticket/22576

File:

• mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py (modified) (13 diffs)

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

@@ -86 +86 @@
 HPFOS_TITLE = 'Discovery feed for Search Services %s' % (HPFOS_ID)
 
-def _append_valid_time(subresult, entry, atomroot, 
+def append_valid_time(subresult, entry, atomroot, 
                        beginPosition, endPosition):
     #xmlentry = entry.buildElement()
@@ -101 +101 @@
         entry.append(validTime) 
 
-def _extractTitle(cedaObj):
+def extractTitle(cedaObj):
     if hasattr(cedaObj, 'identifier'):
         for ident in cedaObj.identifier:
@@ -113 +113 @@
     return "%s/search/%s" % (url, iid)
 
-def _new_extract_geographic_extent(result):        
+def new_extract_geographic_extent(result):        
     if not hasattr(result, 'geographicExtent') \
         or result.geographicExtent is None \
@@ -126 +126 @@
                          '%s %s' % (ge.northBoundLatitude, ge.eastBoundLongitude))
 
-def _digest_fatcat_atom(context, results):
+def digest_fatcat_atom(context, results):
     entries = results.findall('{%s}entry' % (ATOM_NAMESPACE))
     subresults = []
@@ -176 +176 @@
         if result_guid is None:
             continue
-        ititle = _extractTitle(result)
+        ititle = extractTitle(result)
 
         kwargs = {}
@@ -188 +188 @@
         
         #------------------------
-        kwargs['geometry'] = _new_extract_geographic_extent(result)
+        kwargs['geometry'] = new_extract_geographic_extent(result)
         #------------------------                
 
@@ -199 +199 @@
         subresults.append(item)
     return subresults
+
+def import_count_and_page(context):        
+    count = COUNT_DEFAULT
+    start_index = START_INDEX_DEFAULT
+    start_page = START_PAGE_DEFAULT
+    
+    try: 
+        count = int(context['count'])
+    except:
+        pass        
+    
+    try: 
+        start_index = int(context['startIndex'])
+    except:
+        pass
+    
+    try: 
+        start_page = int(context['startPage'])
+    except:
+        pass
+    
+    return count, start_index, start_page
 
 class MyOSAtomResponse(OSAtomResponse):
@@ -221 +243 @@
                 pass
         elif isinstance(results, _ElementInterface):
-            instances = self._digest_fatcat_atom(context, results)
+            instances = digest_fatcat_atom(context, results)
             tot_results = int(results.find('{%s}totalResults' 
                                % (OS_NAMESPACE)).text.replace('\n','').strip())                   
 
-        count, start_index, start_page = self._importCountAndPage(context)                        
+        count, start_index, start_page = import_count_and_page(context)                        
         subresults = filter_results(instances, count, start_index, start_page)
         
@@ -232 +254 @@
             or (type(instances) == InstrumentedList \
                 and type(instances[0]) == CEDA_Observation):
-            subresults = self.apply_query_params(context, subresults)
+            subresults = apply_query_params(context, subresults)
                                                           
         return Result(count, start_index, start_page, tot_results, \
@@ -287 +309 @@
             if hasattr(subresult, 'endPosition') and subresult.endPosition is not None:                
                 endPosition = subresult.endPosition 
-            _append_valid_time(subresult, entry, atomroot, beginPosition, endPosition)            
+            append_valid_time(subresult, entry, atomroot, beginPosition, endPosition)            
             
             idate = createDate(root = atomroot, 
@@ -314 +336 @@
         for entry in entries:
             atomroot.append(entry) 
-
-    def _importCountAndPage(self, context):        
-        count = COUNT_DEFAULT
-        start_index = START_INDEX_DEFAULT
-        start_page = START_PAGE_DEFAULT
-        
-        try: 
-            count = int(context['count'])
-        except:
-            pass        
-        
-        try: 
-            start_index = int(context['startIndex'])
-        except:
-            pass
-        
-        try: 
-            start_page = int(context['startPage'])
-        except:
-            pass
-        
-        return count, start_index, start_page
 
 class MyOSHTMLResponse(OSHTMLResponse):
@@ -387 +387 @@
         
         if context.has_key(GUID) and 'FID' in context[GUID]:
-            return self._extractFatcatEntities(context[GUID])
+            return extractFatcatEntities(context[GUID])
         
         start = None
@@ -417 +417 @@
 
         
-    def _extractFatcatEntities(self, fc_resource_id):
-        path = '/%s/search/%s/atom/' % (FATCAT_ROOT_PATH, str(fc_resource_id))
-        return find_fatcat_atom_entity(host = FATCAT_HOST, path = path)
+def extractFatcatEntities(fc_resource_id):
+    '''
+        Uses the Fatcat resource_id to build and submit an Opensearch query to Fatcat
+    '''
+    path = '/%s/search/%s/atom/' % (FATCAT_ROOT_PATH, str(fc_resource_id))
+    return find_fatcat_atom_entity(host = FATCAT_HOST, path = path)
     
 def find_fatcat_atom_entity(host = 'localhost', path = '', port = 80):