Skip to content
Snippets Groups Projects
Commit d3898e0b authored by Rolf Niepraschk's avatar Rolf Niepraschk
Browse files

remove '/version_xsd', '/update', '/update_xsd'

parent 502149bf
No related branches found
No related tags found
No related merge requests found
...@@ -18,37 +18,7 @@ def version(): ...@@ -18,37 +18,7 @@ def version():
return utils.xml_response(ret) return utils.xml_response(ret)
@app.route('/version_xsd', methods=['GET'])# TODO: unnecessary? @app.route('/validate', methods=['POST'])
def version_xsd():
app.logger.debug('hit version_xsd')
xsd_str = utils.get_xsd(config)
version_str = utils.get_xsd_version(xsd_str)
return utils.xml_response(utils.return_version(version_str))
@app.route('/update', methods=['POST'])
def update():
app.logger.debug('hit update')
#req = request.get_json()
git_cmd.pull()
app.logger.info("pulled {log}".format(log=git_cmd.log("-n 1")))
ret = utils.return_ok()
return utils.xml_response(ret)
@app.route('/update_xsd', methods=['POST'])# TODO: unnecessary / problematic?
def update_xsd():
app.logger.debug('hit update xsd')
xsd_str = utils.get_xsd(config)
xsd_xml = utils.parse(xsd_str)
if xsd_xml:
ret = utils.save_xsd(config, xsd_str, xsd_file_name)
else:
ret = utils.return_error(error='error on atempt to parse xsd file from server')
return utils.xml_response(ret)
@app.route('/validate', methods=['POST'])# TODO: '?v=2.2.0'
def validate(): def validate():
app.logger.debug('hit validate') app.logger.debug('hit validate')
xv = request.args.get('v') xv = request.args.get('v')
......
...@@ -8,8 +8,6 @@ import sys ...@@ -8,8 +8,6 @@ import sys
from urllib.parse import urlparse from urllib.parse import urlparse
from pprint import pprint from pprint import pprint
ns = {"w3":"http://www.w3.org/2001/XMLSchema"}
# https://stackoverflow.com/questions/7160737/python-how-to-validate-a-url-in-python-malformed-or-not # https://stackoverflow.com/questions/7160737/python-how-to-validate-a-url-in-python-malformed-or-not
def uri_validator(x): def uri_validator(x):
try: try:
...@@ -58,13 +56,6 @@ def get_xsd(cfg, xsd_version=None, xml_str = None): ...@@ -58,13 +56,6 @@ def get_xsd(cfg, xsd_version=None, xml_str = None):
return xsd_str return xsd_str
def save_xsd(config, xsd_str, file_name):
path_file = get_xsd_path_file(config, file_name)
file = open(path_file, "w")
file.write(xsd_str)
return return_ok()
def parse(xml_str): def parse(xml_str):
try: try:
tree = ET.fromstring(xml_str) tree = ET.fromstring(xml_str)
...@@ -72,16 +63,6 @@ def parse(xml_str): ...@@ -72,16 +63,6 @@ def parse(xml_str):
tree = None tree = None
return tree return tree
def get_xsd_version(xsd_str):
"""The version is tag is a declaration and so
not part of the parse tree
"""
root = parse(xsd_str)
if root.tag.endswith("schema"):
return root.attrib.get("version", "")
else:
return ""
def validate(xml_str, xsd_str): def validate(xml_str, xsd_str):
try: try:
tree = parse(xml_str) tree = parse(xml_str)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment