diff --git a/pkg/wfs200/describefeaturetype_test.go b/pkg/wfs200/describefeaturetype_test.go index 8eb0506..5d8700f 100644 --- a/pkg/wfs200/describefeaturetype_test.go +++ b/pkg/wfs200/describefeaturetype_test.go @@ -28,7 +28,7 @@ func TestParseBodyDescribeFeatureType(t *testing.T) { {Name: xml.Name{Space: "xmlns", Local: "kadastralekaartv4"}, Value: "http://kadastralekaartv4.geonovum.nl"}, {Name: xml.Name{Space: "http://www.w3.org/2001/XMLSchema-instance", Local: "schemaLocation"}, Value: "http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd http://inspire.ec.europa.eu/schemas/inspire_dls/1.0 http://inspire.ec.europa.eu/schemas/inspire_dls/1.0/inspire_dls.xsd http://inspire.ec.europa.eu/schemas/common/1.0 http://inspire.ec.europa.eu/schemas/common/1.0/common.xsd"}}}}}, // Unknown XML document - 1: {Body: []byte(""), Error: &WFSException{ExceptionText: "expected element type but have "}}, + 1: {Body: []byte(""), Error: &WFSException{ExceptionText: "This service does not know the operation: expected element type but have "}}, // no XML document 2: {Body: []byte("no XML document, just a string"), Error: &WFSException{ExceptionText: "Could not process XML, is it XML?"}}, // document at all diff --git a/pkg/wfs200/exception.go b/pkg/wfs200/exception.go index bd1e704..eae8b0e 100644 --- a/pkg/wfs200/exception.go +++ b/pkg/wfs200/exception.go @@ -26,7 +26,7 @@ func (r WFSExceptionReport) Report(errors []ows.Exception) []byte { r.Xsi = `http://www.w3.org/2001/XMLSchema-instance` r.Version = Version r.Language = `en` - r.Exception = err + r.Exception = errors si, _ := xml.MarshalIndent(r, "", " ") return append([]byte(xml.Header), si...) diff --git a/pkg/wfs200/getcapabilities_test.go b/pkg/wfs200/getcapabilities_test.go index d2cde1d..67ea1bb 100644 --- a/pkg/wfs200/getcapabilities_test.go +++ b/pkg/wfs200/getcapabilities_test.go @@ -26,7 +26,7 @@ func TestParseBodyGetCapabilities(t *testing.T) { {Name: xml.Name{Space: "xmlns", Local: "kadastralekaartv4"}, Value: "http://kadastralekaartv4.geonovum.nl"}, {Name: xml.Name{Space: "http://www.w3.org/2001/XMLSchema-instance", Local: "schemaLocation"}, Value: "http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd http://inspire.ec.europa.eu/schemas/inspire_dls/1.0 http://inspire.ec.europa.eu/schemas/inspire_dls/1.0/inspire_dls.xsd http://inspire.ec.europa.eu/schemas/common/1.0 http://inspire.ec.europa.eu/schemas/common/1.0/common.xsd"}}}}, // Unknown XML document - 1: {Body: []byte(""), Error: &WFSException{ExceptionText: "expected element type but have "}}, + 1: {Body: []byte(""), Error: &WFSException{ExceptionText: "This service does not know the operation: expected element type but have "}}, // no XML document 2: {Body: []byte("no XML document, just a string"), Error: &WFSException{ExceptionText: "Could not process XML, is it XML?"}}, // document at all diff --git a/pkg/wms130/exception.go b/pkg/wms130/exception.go index 3b5846c..11912f9 100644 --- a/pkg/wms130/exception.go +++ b/pkg/wms130/exception.go @@ -20,7 +20,7 @@ type WMSServiceExceptionReport struct { // Report returns WMSServiceExceptionReport func (r WMSServiceExceptionReport) Report(errors []ows.Exception) []byte { - r.ServiceException = err + r.ServiceException = errors si, _ := xml.MarshalIndent(r, "", " ") return append([]byte(xml.Header), si...) }