Changeset 8355 for mauRepo/HPFos

Timestamp:

17/06/12 09:44:57 (9 years ago)

Author:

mnagni

Message:

retrieve the hostURL from the request
minimal home page

Location:

mauRepo/HPFos/trunk/src

Files:

• HPFos/molesSessionMiddleware.py (modified) (1 diff)
• HPFos/osImpl/hpfos_conf.py (modified) (1 diff)
• HPFos/osImpl/myimpl.py (modified) (1 diff)
• HPFos/template/homeTemplate (added)
• HPFos/urls.py (modified) (1 diff)
• HPFos/view/view.py (modified) (3 diffs)
• libs/commons_db.py (modified) (1 diff)
• libs/epb.py (modified) (1 diff)
• markup/opensearch/os_engine.py (modified) (4 diffs)
• markup/opensearch/query.py (modified) (1 diff)
• markup/template/atom.py (modified) (1 diff)
• markup/template/osresponse.py (modified) (1 diff)

mauRepo/HPFos/trunk/src/HPFos/molesSessionMiddleware.py

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 9 Jan 2012
 
-@author: mnagni
+@author: Maurizio Nagni
 '''
 from libs.commons_db import DbManager

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

@@ -41 +41 @@
     os_short_name = "Web Search"
     os_description = "A default description"
-    os = OpenSearchRequest(query, [atomResponse], os_short_name, \
-                           os_description)
-    return OSEngine(os, 'http://localhost:8000')   
+    os = OpenSearchRequest(query, [atomResponse], os_short_name, os_description)
+    return OSEngine(os)   

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

@@ -74 +74 @@
         
                         
-    def generateResponse(self, result, queries, ospath, **kwargs):
+    def generateResponse(self, result, queries, osHostURL, **kwargs):
         """
             @param result: a Result instance
             @param queries:
-            @param ospath:  
+            @param osHostURL:  
             @param kwargs: 
         """
         id = ""
-        ospath = self.generateLinkHref(ospath, result.id, self.extension, rel = None)
+        ospath = self.generateLinkHref(osHostURL, result.id, self.extension, rel = None)
         
         #Generates the ATOM document

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

@@ -19 +19 @@
 )
 
-urlpatterns += patterns('HPFos.view.testview',
-    (r'test$', 'doSearch'),
+urlpatterns += patterns('HPFos.view.view',
+    (r'$', 'getHome'),
 )
 

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

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 1 Nov 2011
 
-@author: mnagni
+@author: Maurizio Nagni
 '''
 from django.shortcuts import render_to_response
 from django.core.context_processors import csrf
 from django.utils.safestring import mark_safe
-from osImpl.myimpl import COLLECTION, OBSERVATION, RESULT
-from settings import os_engine
+from HPFos.settings import os_engine
+from HPFos.osImpl.myimpl import COLLECTION, OBSERVATION, RESULT
+
+hostURL = 'http://localhost:8000'
+
+def _buildHostURL(request):
+    if request.is_secure():
+        return 'https://%s' % (request.get_host())
+    else:
+        return 'http://%s' % (request.get_host())
+
+def getHome(request):
+    context = {}
+    context['hostURL'] = _buildHostURL(request)
+    return _dispatchResponse(request, 'homeTemplate', context)
 
 def getDescription(request, collection_guid = None, observation_guid = None, result_guid = None):
     ospath = _buildDescriptionOsPath(collection_guid, observation_guid, result_guid)
     response = os_engine.getDescription(ospath)
-    return _dispatchResponse(request, response)
+    context = {}
+    context['response'] = mark_safe(response)
+    return _dispatchResponse(request, 'responseTemplate', context)
 
-def _doSearch(request, format, collection_guid = None, observation_guid = None, result_guid = None):    
+def _doSearch(request, iformat, collection_guid = None, observation_guid = None, result_guid = None):
+    host = _buildHostURL(request)   
     #params = {'q': ['ice', 'snow']}
     params = request.GET.copy()
@@ -25 +68 @@
         params[RESULT] = result_guid                
     
-    response = os_engine.doSearch(format, params_values = params, moles3EPB = request.moles3EPB)
-    return _dispatchResponse(request, response)
+    response = os_engine.doSearch(hostURL, iformat, params_values = params, moles3EPB = request.moles3EPB)
+    context = {}
+    context['response'] = mark_safe(response)
+    return _dispatchResponse(request, 'responseTemplate', context)
 
-def doSearchL0(request, format):
-    #params = {'q': ['ice', 'snow']}
-    return _doSearch(request, format)
+def doSearchL0(request, iformat):
+    return _doSearch(request, iformat)
 
-def doSearchL1(request, collection_guid, format):
-    return _doSearch(request, format, collection_guid)
+def doSearchL1(request, collection_guid, iformat):
+    return _doSearch(request, iformat, collection_guid)
 
-def doSearchL2(request, collection_guid, observation_guid, format):
-    return _doSearch(request, format, collection_guid, observation_guid)
+def doSearchL2(request, collection_guid, observation_guid, iformat):
+    return _doSearch(request, iformat, collection_guid, observation_guid)
 
-def doSearchL3(request, collection_guid, observation_guid, result_guid, format):
-    return _doSearch(request, format, collection_guid, observation_guid, result_guid)   
+def doSearchL3(request, collection_guid, observation_guid, result_guid, iformat):
+    return _doSearch(request, iformat, collection_guid, observation_guid, result_guid)   
 
 def _buildDescriptionOsPath(collection_guid = None, observation_guid = None, result_guid = None):
-    ospath = "%s/search/" % (os_engine.ospath)
+    ospath = "%s/search/" % (hostURL)
     if collection_guid:
         ospath = "%s%s/" % (ospath, collection_guid)
@@ -51 +95 @@
     return ospath        
         
-def _dispatchResponse(request, response):
-    c = {}
-    c['response'] = mark_safe(response)
-    c.update(csrf(request))
-    return render_to_response('responseTemplate', c)    
+def _dispatchResponse(request, template, context):
+    context.update(csrf(request))
+    return render_to_response(template, context)    

mauRepo/HPFos/trunk/src/libs/commons_db.py

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 17 Nov 2011
 
-@author: mnagni
+@author: Maurizio Nagni
 '''
 from sqlalchemy import MetaData, create_engine

mauRepo/HPFos/trunk/src/libs/epb.py

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 10 Jan 2012
 
-@author: mnagni
+@author: Maurizio Nagni
 '''
 from sqlalchemy.orm import subqueryload

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

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 24 May 2012
 
-@author: kusanagi
+@author: Maurizio Nagni
 '''
 
@@ -23 +50 @@
     '''
 
-    def __init__(self, osRequest, ospath, osEngineHelper = OSEngineHelper()):
+    def __init__(self, osRequest, osEngineHelper = OSEngineHelper()):
         '''
         Constructor
@@ -31 +58 @@
         '''
         self.osRequest = osRequest
-        self.ospath = ospath
-        self.osEngineHelper = osEngineHelper                
+        self.osEngineHelper = osEngineHelper
+        self.osHostURL = 'http://localhost'             
         
-    def doSearch(self, mimetype, params_values, **kwargs):
+    def doSearch(self, hostURL, mimetype, params_values, **kwargs):
+        self.osHostURL = hostURL
         response = None
         for item in self.osRequest.responses:
@@ -42 +70 @@
             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, **kwargs)
+            return response.generateResponse(self.osRequest.query.doSearch(**kwargs), [queries], self.osHostURL, **kwargs)
         return None                
     

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

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 24 May 2012
 
-@author: kusanagi
+@author: Maurizio Nagni
 '''
 from xml.etree.ElementTree import Element

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

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 5 May 2012
 
-@author: kusanagi
+@author: Maurizio Nagni
 '''
 from markup.template.osresponse import OSResponse

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

@@ -1 +1 @@
 '''
+BSD Licence
+Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC) 
+        nor the names of its contributors may be used to endorse or promote 
+        products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Created on 21 May 2012
 
-@author: kusanagi
+@author: Maurizio Nagni
 '''
 from abc import abstractmethod