Changeset 8523

Timestamp:

17/08/12 09:20:13 (8 years ago)

Author:

mnagni

Message:

Requests, parse and display a fatcat atom feed

Location:

mauRepo/HPFos/trunk

Files:

• hpfos/HPFos/osImpl/commons.py (added)
• hpfos/HPFos/osImpl/myimpl.py (modified) (7 diffs)
• hpfos/HPFos/project_urls.py (added)
• hpfos/tests/testos.py (modified) (4 diffs)
• hpfos/tests/testsetup.py (modified) (1 diff)
• resources/requirements.txt (modified) (1 diff)

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

@@ -52 +52 @@
 from ceda_markup.opensearch.os_param import OSParam
 from hpfos import __version__, __revision__
+from ceda_markup.atom.atom import ATOM_NAMESPACE
+from hpfos.HPFos.osImpl.commons import get_document, get_xml_document,\
+    return_not_none_text
+from xml.etree.ElementTree import _ElementInterface, ElementTree
+from ceda_markup.opensearch.os_request import OpenSearchDescription, OS_NAMESPACE
 
 GUID = 'guid'
@@ -59 +64 @@
 BBOX = 'bbox'
 DUMMY_GUID = 'dummy_guid'
+
+FATCAT_HOST = 'citest1.jc.rl.ac.uk'
+FATCAT_ROOT_PATH = 'fatcatOS'
 
 CEDA_TITLE = 'ceda_title'
@@ -95 +103 @@
         
         return 1
+    
+    def _digest_fatcat_atom(self, context, results):
+        count, start_index, start_page = self._importCountAndPage(context)
+        subresults = results.findall('{%s}entry' % (ATOM_NAMESPACE))
+        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 digest_search_results(self, results, context): 
@@ -108 +123 @@
             #to be done
             filtered = filter_results(results.result, count, start_index, start_page)
-            tot_results = self._get_tot_results(results.result)        
+            tot_results = self._get_tot_results(results.result)
+        elif type(results) == CEDA_Result:
+            filtered = filter_results(results.result, count, start_index, start_page)
+            tot_results = 1  
+        elif isinstance(results, _ElementInterface):
+            return self._digest_fatcat_atom(context, results)                                 
         else:
             filtered = filter_results(results, count, start_index, start_page)
@@ -118 +138 @@
         subresults = []
         for result in filtered:
-            item = None
-            if type(result) != CEDA_Result:            
-                result_guid = context['moles3EPB'].retrieveGUIDFromInstance(result)
-                if result_guid is None:
-                    continue
-                ititle = self._extractTitle(result)
-                item = Subresult(result_guid.id, ititle, datetime.now().isoformat(), description = result.description)
-            else:    
-                item = Subresult(DUMMY_GUID, 'dummy_resultTitle', datetime.now().isoformat(), description = 'dummy_resultDescription')
+            item = None          
+            result_guid = context['moles3EPB'].retrieveGUIDFromInstance(result)
+            if result_guid is None:
+                continue
+            ititle = self._extractTitle(result)
+            item = Subresult(result_guid.id, ititle, datetime.now().isoformat(), description = result.description)               
             subresults.append(item)
         
@@ -137 +154 @@
 
     def generate_entries(self, atomroot, subresults, path):
+        if isinstance(subresults, list) \
+                and len(subresults) > 0 \
+                and isinstance(subresults[0], _ElementInterface):
+            for entry in subresults:
+                atomroot.append(entry)
+            return
+        
         entries = []
         
@@ -249 +273 @@
             return context['moles3EPB'].searchSelectiveLoadByInstance(obj, 'member') #need to add bbox & phenomTime
         elif type(obj) == CEDA_Observation:
-            return context['moles3EPB'].searchSelectiveLoadByInstance(obj, 'result') #need to add bbox & phenomTime
+            #return context['moles3EPB'].searchSelectiveLoadByInstance(obj, 'result') #need to add bbox & phenomTime
+            for source in obj.result.source:
+                if source.function == 'search':
+                    return self._extractFatcatEntities(source.description)
+
+        
+    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 find_fatcat_atom_entity(host = 'localhost', path = '', port = 80):    
+    source = get_document(host, path, port)
+    return get_xml_document(source)

mauRepo/HPFos/trunk/hpfos/tests/testos.py

@@ -66 +66 @@
         response = ar.generate_response(result, queries, '', context)
         self.assertTrue('<link href="/search/atom/?startIndex=3" rel="self" type="application/atom+xml"/>' in response, "Error")
+        self.assertTrue('<link href="/search/atom/?startIndex=1" rel="prev" type="application/atom+xml"/>' in response, "Error")        
         self.assertTrue('<link href="/search/atom/?startIndex=1" rel="first" type="application/atom+xml"/>' in response, "Error")
         self.assertTrue('<link href="/search/atom/?startIndex=10" rel="next" type="application/atom+xml"/>' in response, "Error")
@@ -73 +74 @@
         response = ar.generate_response(result, queries, '', context)
         self.assertTrue('<link href="/search/atom/?startIndex=5" rel="self" type="application/atom+xml"/>' in response, "Error")
+        self.assertTrue('<link href="/search/atom/?startIndex=1" rel="prev" type="application/atom+xml"/>' in response, "Error")        
         self.assertTrue('<link href="/search/atom/?startIndex=1" rel="first" type="application/atom+xml"/>' in response, "Error")
         self.assertTrue('<link href="/search/atom/?startIndex=15" rel="next" type="application/atom+xml"/>' in response, "Error")
@@ -80 +82 @@
         response = ar.generate_response(result, queries, '', context)
         self.assertTrue('<link href="/search/atom/?startIndex=2" rel="self" type="application/atom+xml"/>' in response, "Error")
+        self.assertTrue('<link href="/search/atom/?startIndex=1" rel="prev" type="application/atom+xml"/>' in response, "Error")        
         self.assertTrue('<link href="/search/atom/?startIndex=1" rel="first" type="application/atom+xml"/>' in response, "Error")
         self.assertTrue('<link href="/search/atom/?startIndex=4" rel="next" type="application/atom+xml"/>' in response, "Error")
@@ -87 +90 @@
         response = ar.generate_response(result, queries, '', context)
         self.assertTrue('<link href="/search/atom/?startIndex=18" rel="self" type="application/atom+xml"/>' in response, "Error")
+        self.assertTrue('<link href="/search/atom/?startIndex=17" rel="prev" type="application/atom+xml"/>' in response, "Error")        
         self.assertTrue('<link href="/search/atom/?startIndex=1" rel="first" type="application/atom+xml"/>' in response, "Error")
         self.assertTrue('<link href="/search/atom/?startIndex=19" rel="next" type="application/atom+xml"/>' in response, "Error")

mauRepo/HPFos/trunk/hpfos/tests/testsetup.py

@@ -41 +41 @@
 
     def get_host(self):
-        return self.environ['SERVER_NAME']
+        return getattr(self, 'environ')['SERVER_NAME']
 
     def is_secure(self):
-        return self.host
+        return getattr(self, 'host')

mauRepo/HPFos/trunk/resources/requirements.txt

@@ -7 +7 @@
 # --extra-index-url http://ciprod1.cems.rl.ac.uk/pip
 # to your pip install 
-ceda-markup==0.0.7
+ceda-markup==0.0.8
 ceda-moles-model==0.1.5