Changeset 2653 for TI05-delivery/ows_framework

Timestamp:

27/06/07 14:34:23 (12 years ago)

Author:

domlowe

Message:

changes to getCapabilites and mime handling

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/csml_wcs.py (modified) (5 diffs)
• templates/ows/wcs_capabilities.kid (modified) (1 diff)
• templates/wcs_getCoverageResponse.kid (modified) (1 diff)

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

@@ -43 +43 @@
         
         # Create the container (outer) email message.
-        msg = MIMEMultipart()
+        msg = MIMEMultipart()        
+        
+        xmlfile =StringIO.StringIO(xml)
+        xmlfile.readline(), xmlfile.readline() #don't read in first 2 lines (the content type) as MIMEBase also provides it.
+            
         
         #add the XML part
-        submsg=MIMEText(StringIO.StringIO(xml).read(), _subtype='xml')
+        submsg=MIMEText(xmlfile.read(), _subtype='xml')
+        submsg.add_header('Content-ID', '<coverage.xml>')
         msg.attach(submsg)
 
         
         #add the NetCDF part
-        submsg= MIMEBase('application', 'netcdf')
+        submsg= MIMEBase('application', 'CF-netcdf') #check in ogc docs
         submsg.set_payload(netcdf.read())
+        submsg.set_type('application/CF-netcdf; name="coverage.nc"')
+        submsg.add_header('Content-ID', '<coverage.nc>')
         netcdf.close()
         # Encode the payload using Base64
@@ -78 +85 @@
     def _loadFeatureSummary(self, feature):
         dims = self._loadFeatureDimensions(feature)
+        #TODO - need to ensure proper values for Name. ID and Description are populated.
+        cvgTitle=[feature.description.CONTENT]
+        cvgDescription=feature.description.CONTENT
+        cvgAbstract=[feature.description.CONTENT]
+        bbox=c.dataset.getBoundingBox()  #TODO, use the bounding box of the feature not the dataset.
         return WcsDatasetSummary(identifier=feature.id,
-                                 titles=[feature.description.CONTENT],
-                                 boundingBoxes=[BoundingBox([-180,-90], [180,90],
-                                                            crs='CRS:84')],
-                                 dimensions=dims, description=feature.description.CONTENT            
+                                 titles=cvgTitle,
+                                 boundingBoxes=[BoundingBox([bbox[0],bbox[1]], [bbox[2],bbox[3]],
+                                 crs='CRS:84')], dimensions=dims,  description=cvgDescription,abstracts=cvgAbstract
                                  )
 
@@ -150 +161 @@
                 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:
@@ -161 +177 @@
                     #STORE=true, STATUS = false: Return Coverage XML document with link to file.
                     #use the temp file name (minus extension) as an ID
-                    f=os.path.basename(filename)
-                    c.fileID=os.path.splitext(f)[0]
                     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')
@@ -170 +184 @@
                 #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'

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ows/wcs_capabilities.kid

@@ -53 +53 @@
     <Identifier py:if="ds.identifier is not None" py:content="ds.identifier"/>
     <Description py:if="ds.description is not None" py:content="ds.description"/>
-    <ows:Title></ows:Title>
-    <ows:Abstract></ows:Abstract>
+    <ows:Title py:if="ds.titles is not None" py:content="ds.titles"/>        
+    <ows:Abstract py:if="ds.abstracts is not None" py:content="ds.abstracts"/>    
     <ows:Metadata></ows:Metadata>
     <ows:WGS84BoundingBox></ows:WGS84BoundingBox>

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<GetCoverage xmlns="http://www.opengis.net/wcs/1.1" 
+<Coverages xmlns="http://www.opengis.net/wcs/1.1" 
         xmlns:py="http://purl.org/kid/ns#"
         xmlns:ows="http://www.opengis.net/ows" 
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:schemaLocation="http://www.opengis.net/wcs/1.1/ows ../owsCoverages.xsd http://www.opengis.net/ows ../../../ows/1.0.0/ows19115subset.xsd">
+        xmlns:xlink="http://www.w3.org/1999/xlink" >
     <Coverage>
         <ows:Title>Coverage ${c.fileID}</ows:Title>
         <ows:Abstract>Created from getCoverage request to NDG WCS</ows:Abstract>
         <Identifier>${c.fileID}</Identifier>
-        <Reference>xlink:href"${c.hyperlink}" xlink:role="urn:ogc:def:role:WCS:1.1:metadata</Reference>
+        <Reference>xlink:href="${c.hyperlink}" xlink:role="urn:ogc:def:role:WCS:1.1:metadata"</Reference>
     </Coverage>
-</GetCoverage>
+</Coverages>