ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #373 from bartvde/describelayer

Browse Source 
add exception handling to WMSDescribeLayer Format (r=@tschaub)
This commit is contained in:
Bart van den Eijnden
2012-03-29 15:14:20 -07:00
parent d1d5ab9930 33f8fa0aff
commit cc68be49bf
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js
View File

@@ -90,6 +90,12 @@ OpenLayers.Format.WMSDescribeLayer.v1_1 = OpenLayers.Class(
}
describelayer.push({layerName: layerName, owsType: owsType,
owsURL: owsURL, typeName: typeName});
} else if (nodeName == 'ServiceException') {
// an exception must have occurred, so parse it
var parser = new OpenLayers.Format.OGCExceptionReport();
return {
error: parser.read(data)
};
}
}
return describelayer;

12
tests/Format/WMSDescribeLayer.html
View File

@@ -34,6 +34,18 @@
}
function test_read_exception(t) {
t.plan(1);
var text = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
'<!DOCTYPE ServiceExceptionReport SYSTEM "http://mapstory.dev.opengeo.org:80/geoserver/schemas/wms/1.1.1/WMS_exception_1_1_1.dtd">' +
'<ServiceExceptionReport version="1.1.1" > <ServiceException code="LayerNotDefined" locator="MapLayerInfoKvpParser">' +
'geonode:_map_107_annotations: no such layer on this server' +
'</ServiceException></ServiceExceptionReport>';
var format = new OpenLayers.Format.WMSDescribeLayer();
var obj = format.read(text);
t.ok(!!obj.error, "Error reported correctly");
}
</script>
</head>
<body>