FVDE/ennstatus Changeset - 85bbe14fa8b2 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 85bbe14fa8b2

Parent rev.

Child rev.

[Not reviewed]

version_5

3 1 0

Dennis Fink - 9 years ago 2015-10-17 13:50:00
dennis.fink@c3l.lu

Remove xml export

4 files changed with 10 insertions and 55 deletions:

ennstatus/api/views.py

ennstatus/templates/api/export/xml/network.xml

ennstatus/templates/api/export/xml/server.xml

ennstatus/templates/api/export/xml/single_server.xml

0 comments (0 inline, 0 general)

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -123,14 +123,10 @@ def update(): @@
+    )
 @api_page.route('/export', defaults={'server_type': 'all',
                                      'export_format': 'json'})
 @api_page.route('/export/<any("json", "xml"):export_format>',
                 defaults={'server_type': 'all'})
 @api_page.route(('/export/<any("json", "xml"):export_format>'
                  '/<any("all", "exit", "bridge", "relay", "single")'
 @api_page.route('/export', defaults={'server_type': 'all'})
 @api_page.route(('/export/<any("all", "exit", "bridge", "relay", "single")'
                  ':server_type>'))
-def export(export_format, server_type):
 def export(server_type):
     current_app.logger.info('Handling export')
     if server_type == 'single':
@@ @@ -138,17 +134,7 @@ def export(export_format, server_type): @@
         if server_name is not None:
             server = single_server(server_name)
             if server:
                 if export_format == 'json':
                     current_app.logger.info('Returning server as json!')
                     return (server.json(), 200,
                             {'Content-Type': 'application/json'})
                 else:
                     current_app.logger.info('Returning server as xml!')
                     return (
                         render_template(
                             'api/export/xml/single_server.xml',
                             server=server),
 , {'Content-Type': 'text/xml'})
                 return server.json(), 200, {'Content-Type': 'application/json'}
             else:
                 current_app.logger.warning('Server not found!')
                 return ('Server not found!\n',
@@ @@ -168,14 +154,10 @@ def export(export_format, server_type): @@
+            ]
         else:
             current_app.logger.info('Getting all {}!'.format(server_type))
             servers = list(all_servers_by_type(server_type.lower()))
             servers = [
                 json.loads(
                     server.json()
                 ) for server in all_servers_by_type(server_type.lower())
+            ]
         if export_format == 'json':
             current_app.logger.info('Returning as json!')
             return (json.dumps(servers),
 , {'Content-Type': 'application/json'})
         else:
             current_app.logger.info('Returning as xml!')
             return (render_template('api/export/xml/network.xml',
                                     servers=servers),
 , {'Content-Type': 'text/xml'})
         return json.dumps(servers), 200, {'Content-Type': 'application/json'}

ennstatus/templates/api/export/xml/network.xml

➞

Show inline comments

deleted file

ennstatus/templates/api/export/xml/server.xml

➞

Show inline comments

deleted file

ennstatus/templates/api/export/xml/single_server.xml

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)