[llvm-commits] [zorg] r146879 - in /zorg/trunk/lnt/lnt: lnttool/create.py server/config.py server/ui/templates/error.html server/ui/views.py

[Daniel Dunbar]

Author: ddunbar
Date: Mon Dec 19 11:11:50 2011
New Revision: 146879

URL: http://llvm.org/viewvc/llvm-project?rev=146879&view=rev
Log:
[lnt/v0.4] lnt.server.ui: Add a db_version to the config object and change the
viewer to not try and display any non-0.3 version databases, for now.

Added:
    zorg/trunk/lnt/lnt/server/ui/templates/error.html
Modified:
    zorg/trunk/lnt/lnt/lnttool/create.py
    zorg/trunk/lnt/lnt/server/config.py
    zorg/trunk/lnt/lnt/server/ui/views.py

Modified: zorg/trunk/lnt/lnt/lnttool/create.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/lnttool/create.py?rev=146879&r1=146878&r2=146879&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/lnttool/create.py (original)
+++ zorg/trunk/lnt/lnt/lnttool/create.py Mon Dec 19 11:11:50 2011
@@ -18,14 +18,14 @@
 name = %(name)r
 
 # Path to the LNT server. This is required for use in emails where we need to
-# provude an absolute URL to the server.
+# provide an absolute URL to the server.
 zorgURL = %(hosturl)r
 
 # Temporary directory, for use by the web app. This must be writable by the user
 # the web app runs as.
 tmp_dir = %(tmp_dir)r
 
-# Database directory, for easily rerooting the entire set of database. Database
+# Database directory, for easily rerooting the entire set of databases. Database
 # paths are resolved relative to the config path + this path.
 db_dir = %(db_dir)r
 
@@ -35,7 +35,8 @@
     'default' : { 'path' : %(default_db)r,
                   'showGeneral' : 1,
                   'showNightlytest' : 1,
-                  'showSimple' : 1 },
+                  'showSimple' : 1,
+                  'db_version' : %(default_db_version)r },
     }
 
 # The LNT email configuration.
@@ -116,6 +117,7 @@
     default_db = opts.default_db
     hostname = opts.hostname
     hostsuffix = opts.hostsuffix
+    default_db_version = "0.3"
 
     basepath = os.path.abspath(path)
     if os.path.exists(basepath):

Modified: zorg/trunk/lnt/lnt/server/config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/config.py?rev=146879&r1=146878&r2=146879&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/config.py (original)
+++ zorg/trunk/lnt/lnt/server/config.py Mon Dec 19 11:11:50 2011
@@ -48,14 +48,16 @@
                       bool(dict.get('showNightlytest')),
                       bool(dict.get('showGeneral')),
                       bool(dict.get('showSimple')),
+                      str(dict.get('db_version', '0.3')),
                       email_config)
 
     def __init__(self, path, showNightlytest, showGeneral, showSimple,
-                 email_config):
+                 db_version, email_config):
         self.path = path
         self.showGeneral = showGeneral
         self.showNightlytest = showNightlytest
         self.showSimple = showSimple
+        self.db_version = db_version
         self.email_config = email_config
 
 class Config:

Added: zorg/trunk/lnt/lnt/server/ui/templates/error.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/error.html?rev=146879&view=auto
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/error.html (added)
+++ zorg/trunk/lnt/lnt/server/ui/templates/error.html Mon Dec 19 11:11:50 2011
@@ -0,0 +1,8 @@
+{% extends "layout.html" %}
+{% set components = [("browse", db_url_for("browse"))] %}
+{% block title %}Error{% endblock %}
+{% block body %}
+
+{{ message }}
+
+{% endblock %}

Modified: zorg/trunk/lnt/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/views.py?rev=146879&r1=146878&r2=146879&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/views.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/views.py Mon Dec 19 11:11:50 2011
@@ -62,6 +62,12 @@
             if g.db_info is None:
                 abort(404)
 
+            # Currently the UI has absolutely no support for non-v0.3 databases.
+            if g.db_info.db_version != '0.3':
+                return render_template("error.html", message="""\
+UI support for database with version %r is not yet implemented.""" % (
+                        g.db_info.db_version))
+
             return f(**args)
 
         frontend.add_url_rule(rule, f.__name__, wrap, **options)