National Map records displaying as ESRI REST rather than WMS

[tchaddad]

On the Dev server, we are connecting to National Map records:
http://wcga-vm01.sdsc.edu/discover/#?s=National%20Map%20%28USGS%29

The service types being displayed in the UI (on the right) are labeled as ESRI REST, when in fact they are actually WMS.

The reason for the problem is that in the backend Geoportal configuation we are using "Mapserver" as a keyword to infer that something is an ESRI REST service, when in fact all that it indicates is that something is coming from an ArcServer.

In this case the National Map services are WMS coming from an ArcServer, hence the problem.

[tchaddad]

Looking into this a bit more, the problem can likely be resolved by switching the order of link type detection in the GeoPortal configuration - by detecting WMS after ESRI REST, we likely avoid this problem.

Requires some testing, so should be bundled with the other GeoPortal configuration changes we are making.