Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/get schema without xsd #814

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/get schema without xsd #814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d56c0
ENH: enable to retrieve schema if there is no typle_element has no at…
lgv-acm Mar 18, 2022
854731f
removed comment
lgv-acm Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions owslib/feature/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,14 @@ def get_schema(
type_element = root.find("./{%s}element" % XS_NAMESPACE)
if type_element is None:
return None
complex_type = type_element.attrib["type"].split(":")[1]
try:
# without associated xsd, there is no type attribute -> KeyError
complex_type = type_element.attrib["type"].split(":")[1]
except KeyError:
complex_type = None
elements = _get_elements(complex_type, root)


nsmap = None
if hasattr(root, "nsmap"):
nsmap = root.nsmap
Expand All @@ -65,13 +71,22 @@ def get_schema(
def _get_elements(complex_type, root):
"""Get attribute elements
"""

# use variables here to let findall() figure out what to look for
if complex_type is None:
attribute_name = None
attribute_value = None
else:
attribute_name = 'name'
attribute_value = complex_type


found_elements = []
element = findall(
root,
"{%s}complexType" % XS_NAMESPACE,
attribute_name="name",
attribute_value=complex_type,
attribute_name=attribute_name,
attribute_value=attribute_value,
)[0]
found_elements = findall(element, "{%s}element" % XS_NAMESPACE)

Expand Down Expand Up @@ -129,6 +144,10 @@ def _construct_schema(elements, nsmap):
else:
if schema_key is not None:
schema["properties"][name] = data_type.replace(schema_key + ":", "")
else:
# there is no xsd:xxxx to split
schema["properties"][name] = data_type


if non_nillable:
schema["required"].append(name)
Expand All @@ -137,8 +156,7 @@ def _construct_schema(elements, nsmap):
return schema
else:
return None



def _get_describefeaturetype_url(url, version, typename):
"""Get url for describefeaturetype request

Expand Down Expand Up @@ -175,3 +193,4 @@ def _get_remote_describefeaturetype(url, timeout, headers, auth):
"""
res = openURL(url, timeout=timeout, headers=headers, auth=auth)
return etree.fromstring(res.read())