Skip to content
Snippets Groups Projects
Commit 918badaf authored by Megan Henning's avatar Megan Henning
Browse files

Fix bug in download.json

parent 2a3cab8d
No related branches found
No related tags found
No related merge requests found
{
"id": "#",
"$schema": "http://json-schema.org/draft-04/schema#",
"definitions": {
"filterDefinition": {
......@@ -7,7 +6,8 @@
"properties": {
"+": {"$ref": "#/definitions/filterItems"},
"-": {"$ref": "#/definitions/filterItems"}
}
},
"additionalProperties": false
},
"filterItems": {
"type": "array",
......@@ -48,8 +48,8 @@
"items": {
"type": "object",
"properties": {
"tags": {"$ref": "download.json#/definitions/filterDefinition"},
"types": {"$ref": "download.json#/definitions/filterDefinition"}
"tags": {"$ref": "#/definitions/filterDefinition"},
"types": {"$ref": "#/definitions/filterDefinition"}
}
}
}
......
......@@ -2,10 +2,6 @@ import copy
import json
import jsonschema
import os
import re
import requests
from jsonschema.compat import urlopen, urlsplit
from . import config
......@@ -36,14 +32,14 @@ def _validate_json(json_data, schema, resolver):
# We store the resolvers for each base_uri we use, so that we reuse the schemas cached by the resolvers.
resolvers = {}
def _resolve_schema(schema_uri):
base_uri = os.path.dirname(schema_uri)
if not resolvers.get(base_uri):
with open(schema_uri) as schema_file:
def _resolve_schema(schema_file_uri):
if not resolvers.get(schema_file_uri):
with open(schema_file_uri) as schema_file:
base_uri = os.path.dirname(schema_file_uri)
schema = json.load(schema_file)
resolver = jsonschema.RefResolver('file://'+base_uri+'/', schema)
resolvers[base_uri] = (schema, resolver)
return resolvers[base_uri]
resolvers[schema_file_uri] = (schema, resolver)
return resolvers[schema_file_uri]
def no_op(g, *args): # pylint: disable=unused-argument
return g
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment