From 7bc810b6b8b1b3abb75207cbca4074df6f7a5666 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 15 Feb 2009 22:51:00 +0000 Subject: [PATCH] ogcserver: Add html exception to allowedexceptions --- bindings/python/mapnik/ogcserver/wms111.py | 4 ++-- bindings/python/mapnik/ogcserver/wms130.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/python/mapnik/ogcserver/wms111.py b/bindings/python/mapnik/ogcserver/wms111.py index 2c5944f7b..a652b142d 100644 --- a/bindings/python/mapnik/ogcserver/wms111.py +++ b/bindings/python/mapnik/ogcserver/wms111.py @@ -42,7 +42,7 @@ class ServiceHandler(WMSBaseServiceHandler): 'format': ParameterDefinition(True, str, allowedvalues=('image/png', 'image/jpeg')), 'transparent': ParameterDefinition(False, str, 'FALSE', ('TRUE', 'FALSE')), 'bgcolor': ParameterDefinition(False, ColorFactory, ColorFactory('0xFFFFFF')), - 'exceptions': ParameterDefinition(False, str, 'application/vnd.ogc.se_xml', ('application/vnd.ogc.se_xml', 'application/vnd.ogc.se_inimage', 'application/vnd.ogc.se_blank')) + 'exceptions': ParameterDefinition(False, str, 'application/vnd.ogc.se_xml', ('application/vnd.ogc.se_xml', 'application/vnd.ogc.se_inimage', 'application/vnd.ogc.se_blank','text/html')) }, 'GetFeatureInfo': { 'layers': ParameterDefinition(True, ListFactory(str)), @@ -54,7 +54,7 @@ class ServiceHandler(WMSBaseServiceHandler): 'format': ParameterDefinition(False, str, allowedvalues=('image/png', 'image/jpeg')), 'transparent': ParameterDefinition(False, str, 'FALSE', ('TRUE', 'FALSE')), 'bgcolor': ParameterDefinition(False, ColorFactory, ColorFactory('0xFFFFFF')), - 'exceptions': ParameterDefinition(False, str, 'application/vnd.ogc.se_xml', ('application/vnd.ogc.se_xml', 'application/vnd.ogc.se_inimage', 'application/vnd.ogc.se_blank')), + 'exceptions': ParameterDefinition(False, str, 'application/vnd.ogc.se_xml', ('application/vnd.ogc.se_xml', 'application/vnd.ogc.se_inimage', 'application/vnd.ogc.se_blank','text/html')), 'query_layers': ParameterDefinition(True, ListFactory(str)), 'info_format': ParameterDefinition(True, str, allowedvalues=('text/plain', 'text/xml')), 'feature_count': ParameterDefinition(False, int, 1), diff --git a/bindings/python/mapnik/ogcserver/wms130.py b/bindings/python/mapnik/ogcserver/wms130.py index b452cb23d..645d7b217 100644 --- a/bindings/python/mapnik/ogcserver/wms130.py +++ b/bindings/python/mapnik/ogcserver/wms130.py @@ -43,7 +43,7 @@ class ServiceHandler(WMSBaseServiceHandler): 'format': ParameterDefinition(True, str, allowedvalues=('image/png', 'image/jpeg')), 'transparent': ParameterDefinition(False, str, 'FALSE', ('TRUE', 'FALSE')), 'bgcolor': ParameterDefinition(False, ColorFactory, ColorFactory('0xFFFFFF')), - 'exceptions': ParameterDefinition(False, str, 'XML', ('XML', 'INIMAGE', 'BLANK')), + 'exceptions': ParameterDefinition(False, str, 'XML', ('XML', 'INIMAGE', 'BLANK','HTML')), }, 'GetFeatureInfo': { 'layers': ParameterDefinition(True, ListFactory(str)), @@ -55,7 +55,7 @@ class ServiceHandler(WMSBaseServiceHandler): 'format': ParameterDefinition(False, str, allowedvalues=('image/png', 'image/jpeg')), 'transparent': ParameterDefinition(False, str, 'FALSE', ('TRUE', 'FALSE')), 'bgcolor': ParameterDefinition(False, ColorFactory, ColorFactory('0xFFFFFF')), - 'exceptions': ParameterDefinition(False, str, 'XML', ('XML', 'INIMAGE', 'BLANK')), + 'exceptions': ParameterDefinition(False, str, 'XML', ('XML', 'INIMAGE', 'BLANK','HTML')), 'query_layers': ParameterDefinition(True, ListFactory(str)), 'info_format': ParameterDefinition(True, str, allowedvalues=('text/plain', 'text/xml')), 'feature_count': ParameterDefinition(False, int, 1), @@ -236,6 +236,6 @@ class ExceptionHandler(BaseExceptionHandler): handlers = {'XML': BaseExceptionHandler.xmlhandler, 'INIMAGE': BaseExceptionHandler.inimagehandler, 'BLANK': BaseExceptionHandler.blankhandler, - 'text/html': BaseExceptionHandler.htmlhandler} + 'HTML': BaseExceptionHandler.htmlhandler} defaulthandler = 'XML'