Changeset 2606 for TI05-delivery/ows_framework

Timestamp:

19/06/07 10:34:19 (12 years ago)

Author:

spascoe

Message:

A cleaner way of implementing WCS "store" (hopefully).

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/csml_util.py (modified) (2 diffs)

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

@@ -44 +44 @@
        publish flag is used to indicate that the netcdf file should be made available to the webserver (for asynchronous delivery)
     """
-    # Get temporary extract dir
-    extract_dir = request.environ['paste.config']['app_conf']['tmp_dir']
+
+    if publish:
+        #if publishing to download directory is required, do so and return publishable file name
+        #used e.g. in WCS when "STORE = true"
+        publish_dir=request.environ['paste.config']['app_conf']['publish_dir']
+    else:
+        extract_dir = request.environ['paste.config']['app_conf']['tmp_dir']
     
     # Subset the feature
@@ -51 +56 @@
     feature.subsetToGridSeries(ncname=os.path.basename(filename),
                                outputdir=os.path.dirname(filename) ,**sel)
-    
-    #if publishing to download directory is required, do so and return publishable file name
-    #used e.g. in WCS when "STORE = true"
-    if publish !=False:
-        publish_dir=request.environ['paste.config']['app_conf']['publish_dir']
-        #copy file from tmp_dir to publish directory
-        publishedName=publish_dir +'/'+os.path.basename(filename)
-        os.system ("cp %s %s" % (filename, publishedName))
-        return publishedName
+
     return filename