Changeset 2892 for TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py

Timestamp:

18/09/07 12:21:44 (13 years ago)

Author:

domlowe

Message:

error handling simplified

File:

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

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

@@ -196 +196 @@
                raise e
             elif isinstance(e, ValueError):
-                if e == '<p> Access Denied </p><p>Not Logged in</p>':
-                    c.xml='<div class="error">%s</div>'%e
-                    return render_response('error')              
-                else:
-                    raise OWS_E.NoApplicableCode(e)
+                c.xml='<div class="error">%s</div>'%e
+                return render_response('error')
             else:
                 raise OWS_E.NoApplicableCode(e)
@@ -230 +227 @@
                raise e
             elif isinstance(e, ValueError):
-                if e.message == '<p> Access Denied </p><p>Not Logged in</p>':
-                    c.xml='<div class="error">%s</div>'%e
-                    return render_response('error')
-                else:
-                    raise OWS_E.NoApplicableCode(e)
+                c.xml='<div class="error">%s</div>'%e
+                return render_response('error')
             else:
                raise OWS_E.NoApplicableCode(e)
@@ -351 +345 @@
                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)
+                c.xml='<div class="error">%s</div>'%e
+                return render_response('error')
             else:
                raise OWS_E.NoApplicableCode(e)