Changeset 2697

Timestamp:

04/07/07 09:30:23 (14 years ago)

Author:

domlowe

Message:

adding statuscontroller back into csml_wcs.py

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py (modified) (6 diffs)

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

@@ -10 +10 @@
 
 #NOTE, much of this is straight from WMS and needs to be overhauled.
-
-try: #python 2.5
-    from xml.etree import ElementTree as ET
-except ImportError:
-    try:
-        # if you've installed it yourself it comes this way
-        import ElementTree as ET
-    except ImportError:
-        # if you've egged it this is the way it comes
-        from elementtree import ElementTree as ET
-
 import os, time, string, StringIO
 
@@ -27 +16 @@
 import ows_server.lib.validators as V
 
+from elementtree import ElementTree as ET
 from ows_common import exceptions as OWS_E
 from ows_common.wcs import *
@@ -33 +23 @@
 
 from ows_server.lib.csml_util import get_csml_doc, extractToNetCDF
-from ows_server.lib.ndgInterface import interface
+from ows_server.lib.csml_cache import csmlCache, extractCache
+
+from ows_server.controllers.status import StatusController
 
 from email.mime.multipart import MIMEMultipart
@@ -140 +132 @@
         
         #get doc from cache or disk:
-        c.dataset = interface.GetParsedCSML(fileoruri)
+        c.dataset = csmlCache[fileoruri]
         if type(c.dataset) is str:
             #If not a csml datset is some message from exist such as 'access denied'           
@@ -158 +150 @@
     # Dimension parameters Time, Elevation, etc. are handled separately
     def GetCoverage(self, fileoruri, version, format, identifier, boundingbox, timesequence, store=False, status=False):
-            #try:
+        try:
                     # Retrieve dataset and selected feature            
-            rstatus,dataset=interface.GetParsedCSML(fileoruri)
-            if not rstatus: raise ValueError(dataset)
+            dataset = csmlCache[fileoruri]
             feature = dataset.getFeature(identifier)
             if feature is None:
@@ -240 +231 @@
                 return Response(content=msg, mimetype='multipart') 
                   
-        #except Exception, e:
-         #   raise Exception,e
-          #  if isinstance(e, OWS_E.OwsError):
-           #     raise e
-            #else:
-             #   raise OWS_E.NoApplicableCode(e)
-        
-        
+        except Exception, e:
+            if isinstance(e, OWS_E.OwsError):
+                raise e
+            else:
+                raise OWS_E.NoApplicableCode(e)
+        
+