Changeset 2694

Timestamp:

03/07/07 17:00:31 (14 years ago)

Author:

lawrence

Message:

Interim commit to support common cache. At this point
it's implemented in retrieve (although not obviously
working in all cases).

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/login.py (modified) (1 diff)
• controllers/retrieve.py (modified) (3 diffs)
• lib/base.py (modified) (1 diff)
• lib/ndgInterface.py (added)
• models/ndgRetrieve.py (modified) (4 diffs)
• models/stubB.py (modified) (3 diffs)
• public/js/OLMapBox.js (modified) (1 diff)
• templates/meta.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py

@@ -24 +24 @@
         # and now go back to whence we had come
         if c.returnTo!='':
+            # is there a keyword on redirect_to that can make this https? See:
+            # http://pylonshq.com/project/pylonshq/browser/Pylons/trunk/pylons/decorators/secure.py#L69
             h.redirect_to(c.returnTo)
         else:

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py

@@ -1 +1 @@
 
 from ows_server.lib.base import *
-from ows_server.models import ndgObject,  ndgRetrieve, Utilities
+from ows_server.models import ndgObject,  Utilities
 from paste.request import parse_querystring
 from ows_server.models import stubB,DIF
 from ows_server.lib import mailer
-
+from ows_server.lib.ndgInterface import interface 
 from xml.parsers.expat import ExpatError
 #from ows_server.models import ndgRetrieve
@@ -39 +39 @@
             c.xml='<p>%s</p>'%status
             return render_response('error')
-        status,x=ndgRetrieve.ndgRetrieve(
-                self.uri,self.cf,logger=self.logger,requestor=self.requestor,format=self.format)
+        status,x=interface(self.uri,self.cf,logger=self.logger,format=self.format)
         
         if status:
@@ -57 +56 @@
             c.xml='<p>%s</p>'%status 
             return render_response('error')
-        if 'ndgSec' in session:
-            securityTokens=session['ndgSec']
-        else: securityTokens=None
-
-        status,x=ndgRetrieve.ndgRetrieve(
-                self.uri,self.cf,logger=self.logger,requestor=self.requestor,format=self.format,
-                securityTokens=securityTokens)
+        status,x=interface.GetXML(uri)
         c.title='Viewing [%s]'%self.uri
        
-        
         if status:
             #(the return object x is an xmlHandler object)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

@@ -24 +24 @@
 
 class BaseController(WSGIController):
+    
     def __call__(self, environ, start_response):
         # Insert any code to be run per request here. The Routes match

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgRetrieve.py

@@ -2 +2 @@
 import cgi,time
 from Utilities import myConfig
-from ndgSecurity import HandleSecurity
+
 
 debug=0
-def ndgRetrieve(uri,config,logger=0,requestor='test',format='',securityTokens=None):
+def ndgRetrieve(uri,config,logger=0,format=''):
     
     ''' Given an ndgObject, uri, retrieve it, with security in place '''
@@ -38 +38 @@
         status,ws=getws(config,uri)
         if not status: return status,ws
-    try:
-        if uri.schema=='NDG-A0':
-            target='/db/ndg_A_metadata'
-        elif uri.schema=='NumSim':
-            target='/db/NumSim'
-        else:
-            target='/db/ndg_B_metadata'
-        if format=='': format=uri.schema 
-        #do the actual search:
-        time1=time.time()
-        print uri.uri
-        if debug:
-            if uri.uri in ['badc.nerc.ac.uk__NDG-B1__dataent_COAPEC',
-                           'badc.nerc.ac.uk__NumSim__HiGEM_6.1_CodeBase',
-                           'badc.nerc.ac.uk__NumSim__HiGEM_6.1_Control']:
-                f=str('ows_server/examples/%s.xml'%uri.uri)
-                r=file(f,'r').read()
-        else:
-            r=ws.get(uri.repository,uri.schema,uri.localID,format=format,targetCollection=target)
-        time2=time.time()-time1
-        logString='Document retrieve [%s] for [%s] took [%ss]'%(uri,requestor,time2)
-        if logger: logger.info(logString)
+    #try:
+    if uri.schema=='NDG-A0':
+        target='/db/ndg_A_metadata'
+    elif uri.schema=='NumSim':
+        target='/db/NumSim'
+    else:
+        target='/db/ndg_B_metadata'
+    if format=='': format=uri.schema 
+    #do the actual search:
+    time1=time.time()
+    print uri.uri
+    if debug:
+        if uri.uri in ['badc.nerc.ac.uk__NDG-B1__dataent_COAPEC',
+                        'badc.nerc.ac.uk__NumSim__HiGEM_6.1_CodeBase',
+                        'badc.nerc.ac.uk__NumSim__HiGEM_6.1_Control']:
+            f=str('ows_server/examples/%s.xml'%uri.uri)
+            r=file(f,'r').read()
+    else:
+        r=ws.get(uri.repository,uri.schema,uri.localID,format=format,targetCollection=target)
+    time2=time.time()-time1
+    logString='Document retrieve [%s] took [%s]'%(uri,time2)
+    if logger: logger.info(logString)
 
-        # did we get a sensible answer?
-        if isinstance(r,int):
-            return 0,'<p> There are %s identifiers matching your request! </p>'%r
-            
-    except Exception,e:
-        return 0,'<p> Unable to retrieve [%s], reason was [%s]</p>'%(uri,cgi.escape(str(e)))
+    # did we get a sensible answer?
+    if isinstance(r,int):
+        return 0,'<p> There are %s identifiers matching your request! </p>'%r
+        
+    #except Exception,e:
+    #    return 0,'<p> Unable to retrieve [%s], reason was [%s]</p>'%(uri,cgi.escape(str(e)))
     
     #temporary hack for empty docs from non-existent DIFs ... 
@@ -74 +74 @@
         
     x=xmlHandler2.xmlHandler(r,string=1)
-    if uri.schema=='DIF':
-        pass # no access control
-    elif uri.schema =='NDG-B0':
-        #cred=x.find('dgSecurityCondition/simpleCondition')
-        #if cred:
-        #    return 0,'<p> Access Control: <br/>[<![CDAT[%s]]> </p>'
-        pass
-    elif uri.schema =='NDG-B1':
-        pass
-    elif uri.schema =='NDG-A0':
-        
-        s=x.tree.find('{http://ndg.nerc.ac.uk/csml}AccessControlPolicy/{http://ndg.nerc.ac.uk/csml}dgSecurityCondition')
-        if s is not None:
-            status,message=HandleSecurity(s,securityTokens)
-            if not status: return 0,'<p> Access Denied </p><p>%s</p>'%message
+    
     return 1,x
     
@@ -155 +141 @@
         status,xml=ndgRetrieve(uri,self.c)
         if status: s=str(xml)
-        
-    
-    def testSecurityCSML(self):
-        ''' Make sure that CSML security is respected '''
-        securityTokens=None
-        self.setup()
-        doc='badc.nerc.ac.uk__NDG-A0__AfEj15o6'
-        uri=ndgObject.ndgObject(doc)
-        status,xml=ndgRetrieve(uri,self.c)
-        self.assertEqual(status,0)
+
         
         

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/stubB.py

@@ -75 +75 @@
 
 class ObservationStation:
-    def __init__(self,e):
+    def __init__(self,h,e):
         self.e=e
         if e is None: return
 class DataProductionTool:
-    def __init__(self,e):
+    def __init__(self,h,e):
         self.e=e
         if e is None: return
 class Activity:
-    def __init__(self,e):
+    def __init__(self,h,e):
         self.e=e
         if e is None: return
@@ -182 +182 @@
                 self.citation=''
                 self.personnel=[] # for DIF compatiability for the moment.
+                self.parameters=None
+                self.granules=[]
                 
                 try:
@@ -210 +212 @@
                         DataEntity.__init__(self,helper,elem)
                 elif elem.tag=='dgActivity':
-                        pass
+                        Activity.__init__(self,helper,elem)
                 elif elem.tag=='dgDataProductionTool':
-                        pass
+                        DataProductionTool.__init__(self,helper,elem)
                 elif elem.tag=='dgObservationStation':
-                        pass
+                        ObservationStation.__init__(self,helper,elem)
 
                 self.description=dgMetadataDescription(helper,helper.find(self.tree,'dgMetadataDescription'))

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/js/OLMapBox.js

@@ -12 +12 @@
     initialize: function(div, formDiv, selFormDiv, controlUri) {
         this.control = controlUri // Yadayada yada ... I dunno what i'm doing 
-        this.control.onchange = this.updateDdcLayer.bindAsEventListener(this);
+        //this.control.onchange = this.updateDdcLayer.bindAsEventListener(this);
         
         this.selFormDiv = $(selFormDiv);

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/meta.kid

@@ -5 +5 @@
     
     <div py:def="ParameterList(params)" class="ParameterList">
-        <table cellspacing="0" cellpadding="3" border="0" width="100%"><tbody>
+        <table py:if="params is not None" cellspacing="0" cellpadding="3" border="0" width="100%"><tbody>
             <tr><td class="linehead"><span class="heading0"> Parameters</span></td></tr>
             <span py:for="item in params">