Changeset 8640 for mauRepo

Timestamp:

18/10/12 17:21:55 (7 years ago)

Author:

mnagni

Message:

Fixes  http://team.ceda.ac.uk/trac/ceda/ticket/22576

File:

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

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

@@ -49 +49 @@
 from ceda_markup.opensearch.template.atom import OSAtomResponse
 from ceda_markup.opensearch.template.html import OSHTMLResponse
+from sqlalchemy.orm.collections import InstrumentedList
 from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant \
     import TM_Instant
@@ -106 +107 @@
         '''
     
-    def _digest_fatcat_atom(self, context, results):
+    def _digest_fatcat_atom_(self, context, results):
         count, start_index, start_page = self._importCountAndPage(context)
         entries = results.findall('{%s}entry' % (ATOM_NAMESPACE))
@@ -148 +149 @@
                       subresult = subresults, title=HPFOS_TITLE)        
         
+    def _digest_fatcat_atom(self, context, results):
+        entries = results.findall('{%s}entry' % (ATOM_NAMESPACE))
+        subresults = []
+        for entry in entries:
+            iid = entry.find('{%s}id' % (ATOM_NAMESPACE)).text.strip()
+            ititle = entry.find('{%s}title' % (ATOM_NAMESPACE)).text.strip()
+            kwargs = {}
+                         
+            element = entry.find('.//{%s}beginPosition' % (GML_NAMESPACE))
+            if element is not None:
+                kwargs['beginPosition'] = element.text.strip()
+                element = None
+            
+            element = entry.find('.//{%s}endPosition' % (GML_NAMESPACE))
+            if element is not None:
+                kwargs['endPosition'] = element.text.strip()
+                element = None            
+            
+            geometry = entry.find('.//{%s}posList' % (GML_NAMESPACE))
+            if geometry is not None:
+                kwargs['geometry'] = 'POLYGON((%s))' % geometry.text.strip()
+            else:
+                geometry = entry.find('.//{%s}Envelope' % (GML_NAMESPACE))
+                if geometry is not None:
+                    lc = geometry.find('./{%s}lowerCorner' % (GML_NAMESPACE)).text.strip()
+                    uc = geometry.find('./{%s}upperCorner' % (GML_NAMESPACE)).text.strip()
+                    kwargs['geometry'] = _create_box2d(lc, uc)
+
+
+            kwargs['enclosure'] = entry.findall("./{%s}link" % (ATOM_NAMESPACE))
+            #This can be activated on python >= 2.7
+            #kwargs['enclosure'] = entry.findall("./{%s}link[@rel='enclosure']" % (ATOM_NAMESPACE))                         
+            kwargs['description'] = 'no description'
+            subresults.append(Subresult(iid, ititle, 
+                                        datetime.now().isoformat(), **kwargs))
+        
+        return subresults
+    
+        '''
+        tot_results = int(results.find('{%s}totalResults' 
+                                       % (OS_NAMESPACE)).text.replace('\n','').strip())
+    
+        return Result(count, start_index, start_page, tot_results,
+                      subresult = subresults, title=HPFOS_TITLE)  
+        '''      
+        
     def _check_text_filter(self, text, title, description):
         words = text.split()
@@ -228 +275 @@
         return subresults
 
-    def digest_search_results(self, results, context):
+    def digest_search_results_(self, results, context):
         if type(results) == CEDA_ObservationCollection:
             results = results.member
         elif isinstance(results, _ElementInterface):
-            return self._digest_fatcat_atom(context, results)                    
+            return self._digest_fatcat_atom_(context, results)                    
 
         count, start_index, start_page = self._importCountAndPage(context)
@@ -250 +297 @@
             pass
                         
+        return Result(count, start_index, start_page, tot_results, \
+                      subresult = subresults, title=HPFOS_TITLE)
+
+    def digest_search_results(self, results, context):
+        instances = None
+        tot_results = 0
+        if type(results) == CEDA_ObservationCollection:
+            instances = results.member
+        elif type(results) == tuple:
+            ids = [id[0] for id in results[1]] 
+            instances = context['moles3EPB'].get_instance_by_ids(ids)
+            try:
+                tot_results = len(instances)
+            except:
+                pass
+        elif isinstance(results, _ElementInterface):
+            instances = self._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)                        
+        subresults = filter_results(instances, count, start_index, start_page)
+        
+        if (type(instances) == list \
+                and type(instances[0]) == CEDA_ObservationCollection) \
+            or (type(instances) == InstrumentedList \
+                and type(instances[0]) == CEDA_Observation):
+            subresults = self.apply_query_params(context, subresults)
+                                                          
         return Result(count, start_index, start_page, tot_results, \
                       subresult = subresults, title=HPFOS_TITLE)