Changeset 2782

Timestamp:

08/08/07 11:48:30 (14 years ago)

Author:

domlowe

Message:

integrating Trajectory subsetting into pylons wcs

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/csml_wcs.py (modified) (1 diff)
• controllers/fetch.py (modified) (1 diff)
• lib/csml_util.py (modified) (2 diffs)

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

@@ -234 +234 @@
     def GetCoverage(self, uri, version, format, identifier, boundingbox, timesequence, store=False, status=False):
         # Retrieve dataset and selected feature            
-        try:
-            rstatus,dataset=interface.GetParsedCSML(uri)
-            if not rstatus: raise ValueError(dataset)
-            feature = dataset.getFeature(identifier)
-            if feature is None:
-                raise OWS_E.InvalidParameterValue('Coverage not found', 'identifier')
+        #try:
+        rstatus,dataset=interface.GetParsedCSML(uri)
+        if not rstatus: raise ValueError(dataset)
+        feature = dataset.getFeature(identifier)
+        if feature is None:
+            raise OWS_E.InvalidParameterValue('Coverage not found', 'identifier')
+        
+                    
+        #set bounding box 
+        
+        lon=feature.getLongitudeAxis()
+        lat=feature.getLatitudeAxis()
+        t=feature.getTimeAxis()
+        if None in [lon, lat, time]:
+            #TODO need to return a suitable wcs error.
+            print 'warning, could not get correct axis info'
+        
+        #create selection dictionary:
+        sel={}
+        sel[lat]=(boundingbox[1], boundingbox[3])
+        sel[lon]=(boundingbox[0], boundingbox[2])
+        sel[t]=timesequence
+        #z is the 4th axis (eg height or pressure).
+        #NOTE, need to decide whether bounding box is of form: x1,y1,z1,x2,y2,z2 or x1,y1,x2,y2,z1,z2
+        #currently the latter is implemented. 
+        
+        if len(boundingbox)  == 6:
+            for ax in feature.getAxisLabels():
+                if ax not in [lat, lon, t]:
+                    #must be Z  
+                    z=str(ax)
+                    sel[z]=(boundingbox[4], boundingbox[5])
+        
+        
+        axisNames=feature.getAxisLabels()
+    
+                    
+        # Extract via CSML.subsetToGridSeries()
+        if store:
+            #need to farm off to WPS
+            #but for now...
+            filename = extractToNetCDF(feature, sel, publish = True) 
+        else:
+            filename = extractToNetCDF(feature, sel)
+    
             
-                        
-            #set bounding box TODO
-            sel = dict(latitude=(boundingbox[1], boundingbox[3]), longitude=(boundingbox[0], boundingbox[2]))           
-            sel['time']=timesequence
-            
-            lon=feature.getLongitudeAxis()
-            lat=feature.getLatitudeAxis()
-            t=feature.getTimeAxis()
-        
-            if None in [lon, lat, time]:
-                #TODO need to return a suitable wcs error.
-                pass
-            
-            #create selection dictionary:
-            sel={}
-            sel[lat]=(boundingbox[1], boundingbox[3])
-            sel[lon]=(boundingbox[0], boundingbox[2])
-            sel[t]=timesequence
-            
-            #z is the 4th axis (eg height or pressure).
-            #NOTE, need to decide whether bounding box is of form: x1,y1,z1,x2,y2,z2 or x1,y1,x2,y2,z1,z2
-            #currently the latter is implemented. 
-            
-            if len(boundingbox)  == 6:
-                for ax in feature.getAxisLabels():
-                    if ax not in [lat, lon, t]:
-                        #must be Z  
-                        z=str(ax)
-                        sel[z]=(boundingbox[4], boundingbox[5])
-            
-            
-            axisNames=feature.getAxisLabels()
-        
-                        
-            # Extract via CSML.subsetToGridSeries()
-            if store:
-                #need to farm off to WPS
-                #but for now...
-                filename = extractToNetCDF(feature, sel, publish = True) 
+        #use the randomly allocated filename as a basis for an identifier           
+        f=os.path.basename(filename)
+        c.fileID=os.path.splitext(f)[0]
+        
+        #Depending on if the 'store' parameter is set, either return the netcdf file + coverage xml as a multipart mime or return a coverage document containing a link.
+                    
+        if store:
+            if status:
+                #STORE = true, STATUS = true:
+                #hand off file "id" to StatusController to determine correct ExectuteResponse type response.
+                status=StatusController()
+                jobID=os.path.splitext(os.path.basename(filename)[9:])[0] #remove the 'csml_wxs_' prefix and file extension to create a jobID
+                return status.getStatus(jobID)                   
             else:
-                filename = extractToNetCDF(feature, sel)
-        
-                
-            #use the randomly allocated filename as a basis for an identifier           
-            f=os.path.basename(filename)
-            c.fileID=os.path.splitext(f)[0]
-            
-            #Depending on if the 'store' parameter is set, either return the netcdf file + coverage xml as a multipart mime or return a coverage document containing a link.
-                        
-            if store:
-                if status:
-                    #STORE = true, STATUS = true:
-                    #hand off file "id" to StatusController to determine correct ExectuteResponse type response.
-                    status=StatusController()
-                    jobID=os.path.splitext(os.path.basename(filename)[9:])[0] #remove the 'csml_wxs_' prefix and file extension to create a jobID
-                    return status.getStatus(jobID)                   
+                #STORE=true, STATUS = false: Return Coverage XML document with link to file.
+                #use the temp file name (minus extension) as an ID
+                c.hyperlink = 'http://'+request.environ['HTTP_HOST']+'/'+os.path.basename(request.environ['paste.config']['app_conf']['publish_dir'])+'/'+os.path.basename(filename)
+                r=render_response('wcs_getCoverageResponse', format='xml')
+                r.headers['content-type'] = 'text/xml'
+                #write ndgSec to text file and store with coverage file:
+                textName=request.environ['paste.config']['app_conf']['publish_dir']+'/'+os.path.splitext(os.path.basename(filename))[0]+'.txt'
+                secText=open(textName, 'w')
+                if 'ndgSec' in session:
+                    securityinfo=str(session['ndgSec'])
                 else:
-                    #STORE=true, STATUS = false: Return Coverage XML document with link to file.
-                    #use the temp file name (minus extension) as an ID
-                    c.hyperlink = 'http://'+request.environ['HTTP_HOST']+'/'+os.path.basename(request.environ['paste.config']['app_conf']['publish_dir'])+'/'+os.path.basename(filename)
-                    r=render_response('wcs_getCoverageResponse', format='xml')
-                    r.headers['content-type'] = 'text/xml'
-                    #write ndgSec to text file and store with coverage file:
-                    if 'ndgSec' in session:
-                        textName=request.environ['paste.config']['app_conf']['publish_dir']+'/'+os.path.splitext(os.path.basename(filename))[0]+'.txt'
-                        secText=open(textName, 'w')  
-                                    
-                        securityinfo=str(session['ndgSec'])
-                        secText.write(securityinfo)
-                        secText.close()
-                    return r                                 
-            else:                
-                #STORE = FALSE, STATUS therefore irrelevant, return Multipart Mime.
-                netcdfFile=open(filename, 'r')
-                c.hyperlink="cid:coverage.nc"
-                xmlfile=render_response('wcs_getCoverageResponse', format='xml')
-                xmlfile.headers['content-type'] = 'text/xml'
-                multipart=self._createMultipartMime(xmlfile, netcdfFile)        
-                msg=multipart
-                #msg=open(multipart, 'r').readlines()
-                return Response(content=msg, mimetype='multipart') 
+                    securityinfo='No Security'
+                secText.write(securityinfo)
+                secText.close()                  
+                return r                                 
+        else:                
+            #STORE = FALSE, STATUS therefore irrelevant, return Multipart Mime.
+            netcdfFile=open(filename, 'r')
+            c.hyperlink="cid:coverage.nc"
+            xmlfile=render_response('wcs_getCoverageResponse', format='xml')
+            xmlfile.headers['content-type'] = 'text/xml'
+            multipart=self._createMultipartMime(xmlfile, netcdfFile)        
+            msg=multipart
+            #msg=open(multipart, 'r').readlines()
+            return Response(content=msg, mimetype='multipart') 
                   
-        except Exception, e:
-            if isinstance(e, OWS_E.OwsError):
-               raise e
-            elif isinstance(e, ValueError):
-                if e.message == '<p> Access Denied </p><p>Not Logged in</p>':
-                    c.msg=e.message
-                    #h.redirect_to('/login')  
-                    return render_response('wcs_accessDenied', mimetype ='text/html')
-                else:
-                    raise OWS_E.NoApplicableCode(e)
-            else:
-               raise OWS_E.NoApplicableCode(e)
-        
-        
+        #comment out for now while testing         
+        #except Exception, e:
+            #if isinstance(e, OWS_E.OwsError):
+               #raise e
+            #elif isinstance(e, ValueError):
+                #if e.message == '<p> Access Denied </p><p>Not Logged in</p>':
+                    #c.msg=e.message
+                    ##h.redirect_to('/login')  
+                    #return render_response('wcs_accessDenied', mimetype ='text/html')
+                #else:
+                    #raise OWS_E.NoApplicableCode(e)
+            #else:
+               #raise OWS_E.NoApplicableCode(e)
+        
+        

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

@@ -25 +25 @@
         #if they match, return the file
         #TODO, check this properly
-        if 'ndgSec' in session:
+        if sec=='No Security':
+            match=True #allow       
+        elif 'ndgSec' in session:
             if sec == str(session['ndgSec']):
-                match=True          
+                match=True #allow         
             else:
-                match=False
+                match=False #deny
         else:
-             match=False        
+             match=False  #deny      
         if match:
             #return the file (netcdf)

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

@@ -86 +86 @@
        publish flag is used to indicate that the netcdf file should be made available to the webserver (for asynchronous delivery)
     """
-    
 
     if publish:
@@ -94 +93 @@
     else:
         extract_dir = request.environ['paste.config']['app_conf']['tmp_dir']
-      
-    
+         
     # Subset the feature
     (fd, filename) = tempfile.mkstemp('.nc', 'csml_wxs_', extract_dir); os.close(fd)
-    feature.subsetToGridSeries(ncname=os.path.basename(filename), outputdir=os.path.dirname(filename) ,**sel)
-
+    if type(feature) is csml.parser.GridSeriesFeature:
+        feature.subsetToGridSeries(ncname=os.path.basename(filename), outputdir=os.path.dirname(filename) ,**sel)
+    elif type(feature) is csml.parser.TrajectoryFeature:
+        feature.subsetToTrajectory(ncname=os.path.basename(filename), outputdir=os.path.dirname(filename) ,**sel)
+        
     return filename