From 2acfcd6418101bf98225d8056d8a046a65f339e9 Mon Sep 17 00:00:00 2001 From: Sean Arms Date: Sat, 4 Mar 2017 19:28:16 -0700 Subject: [PATCH 1/2] Remove restriction on resolver service name In TDS 4.6, the latest service had a `name` of `Latest` and a `serviceType` of `Resolver`, at least on Unidata servers. In 5.0, the name has changed to simply `Resolver`, as part of the new Standard Service feature. The name was always configurable by the server admin, so there is no need to explicitly check the `service` elements `name` attribute. --- siphon/catalog.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/siphon/catalog.py b/siphon/catalog.py index b82e5085d..6c8dd15c5 100644 --- a/siphon/catalog.py +++ b/siphon/catalog.py @@ -400,8 +400,7 @@ def _get_latest_cat(catalog_url): """ cat = TDSCatalog(catalog_url) for service in cat.services: - if (service.name.lower() == "latest" and - service.service_type.lower() == "resolver"): + if (service.service_type.lower() == "resolver"): latest_cat = cat.catalog_url.replace("catalog.xml", "latest.xml") return TDSCatalog(latest_cat) From eab0e2def55887d5bdbfe1e353e1ddb7629ae826 Mon Sep 17 00:00:00 2001 From: Sean Arms Date: Sat, 4 Mar 2017 20:12:13 -0700 Subject: [PATCH 2/2] Set log level for catalog metadata validation ERR Invalid values for THREDDS Catalog Metadata are not all that importiant for the end users to see. This commit sets the log level to ERROR instead of WARNING. --- siphon/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siphon/metadata.py b/siphon/metadata.py index 899af2f3c..dba0163aa 100644 --- a/siphon/metadata.py +++ b/siphon/metadata.py @@ -11,7 +11,7 @@ import logging log = logging.getLogger(__name__) -log.setLevel(logging.WARNING) +log.setLevel(logging.ERROR) class _SimpleTypes(object):