Changeset 8352

Timestamp:

15/06/12 23:42:22 (8 years ago)

Author:

mnagni

Message:

 

Location:

mauRepo/HPFos/trunk/src

Files:

• HPFos/HPFos (deleted)
• HPFos/osImpl/myimpl.py (modified) (10 diffs)
• HPFos/urls.py (modified) (4 diffs)
• HPFos/view/view.py (modified) (1 diff)
• markup/opensearch/os_engine.py (modified) (1 diff)
• markup/template/osresponse.py (modified) (1 diff)

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

@@ -25 +25 @@
 RESULT = 'result'
 
+def calculateStep(**kwargs):
+    step = 20
+    if kwargs['params_values'].has_key('count'):
+        step = int(kwargs['params_values']['count'])
+    return step
+
 class MyOSAtomResponse(OSAtomResponse):
     '''
@@ -39 +45 @@
         
                         
-    def generateResponse(self, result, queries, ospath):
+    def generateResponse(self, result, queries, ospath, **kwargs):
         """
             @param result: a Result instance
@@ -55 +61 @@
         #configuration level
         #path = "http://mysite.com/"
-        step = 20
-        
+        step = calculateStep(**kwargs)
+        root = ElementTree(atomdoc).getroot()
         #extracted from result parameter
-        linkid = result.id
-        total_result = len(result.subresult)
+
         #Generate feed's links
-        self.generateFeedLinks(ElementTree(atomdoc).getroot(), ospath, None, total_result, step)
+        self.generateFeedLinks(root, ospath, None, result.totalResult, step)
     
         
         #Inserts the OpenSearchResponse elements
-        osdoc = OpenSearchResponse(ElementTree(atomdoc).getroot())
-        os_totalResults = str(total_result)
+        osdoc = OpenSearchResponse(root)
+        os_totalResults = str(result.totalResult)
         os_startIndex = str(0)
         os_itemsPerPage = str(step)
-        osdoc.createDocument(totalResults = os_totalResults, startIndex = os_startIndex, itemsPerPage = os_itemsPerPage)                      
-        ElementTree(atomdoc).getroot().extend(queries)
-
-        self.generateEntries(ElementTree(atomdoc).getroot(), result.subresult, ospath)
+        osdoc.createDocument(totalResults = os_totalResults, startIndex = os_startIndex, itemsPerPage = os_itemsPerPage)
+        for query in queries:                       
+            root.append(query)
+
+        self.generateEntries(root, result.subresult, ospath)
         
         reparsed = minidom.parseString(tostring(atomdoc))
@@ -167 +173 @@
             entries.append(xmlentry)
 
-        atomroot.extend(entries) 
+        for entry in entries:
+            atomroot.append(entry) 
 
 class MyOSHTMLResponse(OSHTMLResponse):
@@ -180 +187 @@
         super(MyOSHTMLResponse, self).__init__()
         
-    def generateResponse(self, result):
+    def generateResponse(self, result, queries, ospath, **kwargs):
         return result + " HTML!"
         
@@ -203 +210 @@
         params = [param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8] 
         super(MyOSQuery, self).__init__(params)
+
+    def _packResult(self, results, id = None, **kwargs):
+        subresults = []
+
+        step = calculateStep(**kwargs)
+
+        startIndex = self.indexOffset
+        if kwargs['params_values'].has_key('startIndex'):
+            if int(kwargs['params_values']['startIndex']) < len(results):
+                startIndex = int(kwargs['params_values']['startIndex'])
+        
+        startPage = self.pageOffset
+        if kwargs['params_values'].has_key('startPage'):
+            if int(kwargs['params_values']['startPage']) * step < len(results):
+                startPage = int(kwargs['params_values']['startPage'])
+                
+        firstResult = startIndex
+        lastResult = firstResult + step
+
+        if startPage > 1 and (firstResult + startPage*step) <= len(results):
+            firstResult = firstResult + startPage*step
+            if firstResult + step <= len(results):            
+                lastResult = firstResult + step
+            else:
+                lastResult = len(results)
+
+        for result in results[firstResult:lastResult]:
+            result_guid = kwargs['moles3EPB'].retrieveGUIDFromInstance(result)
+            item = Subresult(result_guid.id, "title", datetime.now().isoformat())
+            subresults.append(item)
+        
+        return Result(len(results), subresult = subresults)
+        
         
     def doSearch(self, **kwargs):
@@ -212 +252 @@
             
         results = kwargs['moles3EPB'].getObservationCollections()
-        subresults = []
-
-        for result in results:
-            result_guid = kwargs['moles3EPB'].retrieveGUIDFromInstance(result)
-            item = Subresult(result_guid.id, "title", datetime.now().isoformat())
-            subresults.append(item)
-
-        #item = Subresult("ASA_IM__0P", "ASAR Image Mode source packets Level 0 (ASA_IM__0P)", "2012-06-01T00:52:48.213Z")
-        #subresults.append(item)
-        #item = Subresult("ER02_SAR_RAW_0P", "ERS-2 SAR Image SAR Annotated Raw Data Product Level 0 (ER02_SAR_RAW_0P)", "2012-05-09T11:09:49.570Z")
-        #subresults.append(item)
-        
-        result = Result(subresult = subresults)
-        return result
+        return self._packResult(results, **kwargs)
 
     def searchCollection(self, **kwargs):        
@@ -232 +259 @@
             obs_coll = kwargs['moles3EPB'].searchSelectiveLoadByInstance(obs_coll, 'member')
                         
-        subresults = []
-        for result in obs_coll.member:
-            result_guid = kwargs['moles3EPB'].retrieveGUIDFromInstance(result)
-            item = Subresult(result_guid.id, "title", datetime.now().isoformat())
-            subresults.append(item)
-            
-        result = Result(id = kwargs['params_values'][COLLECTION], subresult = subresults)
-        return result
+        return self._packResult(obs_coll.member, id = kwargs['params_values'][COLLECTION], **kwargs)
 
     def searchObservation(self, **kwargs):        
@@ -260 +280 @@
 
 class Result(object):
-    def __init__(self, id = None, title = "Discovery feed for Search Services", updated = datetime.now().isoformat(), subresult = []):
+    def __init__(self, totalResults, id = None, title = "Discovery feed for Search Services", updated = datetime.now().isoformat(), subresult = []):
         '''
             Constructor
@@ -268 +288 @@
             @param subresult: a Subresults array                       
         '''
+        self.totalResult = totalResults
         self.id = id
         self.title = title

mauRepo/HPFos/trunk/src/HPFos/urls.py

@@ -27 +27 @@
 )
 urlpatterns += patterns('HPFos.view.view',
-    (r'search/(\w+)$', 'doSearchL0'),
+    (r'search/(\w+)/$', 'doSearchL0'),
 )
 
@@ -34 +34 @@
 )
 urlpatterns += patterns('HPFos.view.view',
-    (r'search/(\w+)/(\w+)$', 'doSearchL1'),
+    (r'search/(\w+)/(\w+)/$', 'doSearchL1'),
 )
 
@@ -41 +41 @@
 )
 urlpatterns +=  patterns('HPFos.view.view',
-    (r'search/(\w+)/(\w+)/(\w+)$', 'doSearchL2'),
+    (r'search/(\w+)/(\w+)/(\w+)/$', 'doSearchL2'),
 )
 
@@ -48 +48 @@
 )
 urlpatterns += patterns('HPFos.view.view',
-    (r'search/(\w+)/(\w+)/(\w+)/(\w+)$', 'doSearchL3'),
+    (r'search/(\w+)/(\w+)/(\w+)/(\w+)/$', 'doSearchL3'),
 )

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

@@ -25 +25 @@
         params[RESULT] = result_guid                
     
-    response = os_engine.doSearch(format, params, moles3EPB = request.moles3EPB)
+    response = os_engine.doSearch(format, params_values = params, moles3EPB = request.moles3EPB)
     return _dispatchResponse(request, response)
 

mauRepo/HPFos/trunk/src/markup/opensearch/os_engine.py

@@ -42 +42 @@
             kwargs['params_values'] = params_values
             queries = QueryTag.queryWithRoleRequest(mimetype, self.osRequest.query.params_model, params_values)
-            return response.generateResponse(self.osRequest.query.doSearch(**kwargs), [queries], self.ospath)
+            return response.generateResponse(self.osRequest.query.doSearch(**kwargs), [queries], self.ospath, **kwargs)
         return None                
     

mauRepo/HPFos/trunk/src/markup/template/osresponse.py

@@ -19 +19 @@
         
     @abstractmethod
-    def generateResponse(self, result, queries, ospath):
+    def generateResponse(self, result, queries, ospath, **kwargs):
+        '''
+            @param result: the value returned from a OSQuery.doSearch instance invocation
+            @param queries: the value returned by a QueryTag.queryWithRoleRequest invocation
+            @param ospath: the host URL
+            @param kwargs: a dictionary of custom parameters 
+        '''
         pass