Skip to content

Commit

Permalink
full implementation of ncss dataset.xml
Browse files Browse the repository at this point in the history
full implementation of gridded ncss dataset.xml doc
full implementation of point ncss dataset.xml doc
Testing for both
Sphinx docs
  • Loading branch information
lesserwhirls committed Jun 17, 2015
1 parent f73ead5 commit 2cf889c
Show file tree
Hide file tree
Showing 12 changed files with 1,112 additions and 11 deletions.
2 changes: 2 additions & 0 deletions docs/source/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@
:maxdepth: 2

catalog
metadata
ncssdataset
util
13 changes: 13 additions & 0 deletions docs/source/api/metadata.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
********
Metadata
********

The `siphon.metadata` module contains code to support reading and parsing
metadata elements from a THREDDS Data Server (TDS) Client catalog.

:mod:`siphon.metadata`
======================

.. automodule:: siphon.metadata
:members:
:undoc-members:
14 changes: 14 additions & 0 deletions docs/source/api/ncssdataset.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
************
NCSS Dataset
************

The `siphon.ncss_dataset` module contains code to support reading and parsing
the dataset.xml documents from a THREDDS Data Server (TDS) netCDF Subset
Service document.

:mod:`siphon.ncss_dataset`
==========================

.. automodule:: siphon.ncss_dataset
:members:
:undoc-members:
11 changes: 4 additions & 7 deletions siphon/catalog.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import logging
import xml.etree.ElementTree as ET

from .metadata import TDSCatalogMetadata
from .util import urlopen

Expand Down Expand Up @@ -76,10 +77,6 @@ def __init__(self, catalog_url):
self.services.append(CompoundService(child))
service_skip = self.services[-1].number_of_subservices
service_skip_count = 0
else:
logging.warning("Siphon does not know how to handle %s "
"elements. Please report this issue.",
tag_type)

self._process_datasets()

Expand Down Expand Up @@ -150,7 +147,7 @@ class Dataset(object):
url_path : string
url to the accessible dataset
access_urls : dict
A dictionairy of access urls whose keywords are the access service
A dictionary of access urls whose keywords are the access service
types defined in the catalog (for example, "OPENDAP", "NetcdfSubset",
"WMS", etc.
"""
Expand Down Expand Up @@ -270,7 +267,7 @@ class SimpleService(object):
service_type : string
The service type (i.e. "OPENDAP", "NetcdfSubset", "WMS", etc.)
access_urls : dict
A dictionairy of access urls whose keywords are the access service
A dictionary of access urls whose keywords are the access service
types defined in the catalog (for example, "OPENDAP", "NetcdfSubset",
"WMS", etc.)
"""
Expand Down Expand Up @@ -360,7 +357,7 @@ def get_latest_access_url(catalog_url, access_method):
r"""
Get the data access url, using a specified access method, to the latest
data available from a top level dataset catalog (url). Currently only
supports the existance of one "latest" dataset.
supports the existence of one "latest" dataset.
Parameters
----------
Expand Down
3 changes: 1 addition & 2 deletions siphon/metadata.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from __future__ import print_function

from ._version import get_versions
import logging

userAgent = 'siphon (%s)' % get_versions()['version']
log = logging.getLogger("siphon.ncss_dataset")


class _SimpleTypes(object):
Expand Down

0 comments on commit 2cf889c

Please sign in to comment.