X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e11cdd5476f7f1a456ece94862c211a1b83b093c..b001dd5804c18377b497d87ddf23138282ef2690:/code/main.py

diff --git a/code/main.py b/code/main.py
index a9e54a8..bb863c1 100755
--- a/code/main.py
+++ b/code/main.py
@@ -39,9 +39,8 @@ import cache_acls
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers
-import sipb_xen_database
 from invirt import database
-from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
+from invirt.database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
 
 def pathSplit(path):
@@ -85,7 +84,8 @@ def makeErrorPre(old, addition):
     else:
         return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
 
-Template.sipb_xen_database = sipb_xen_database
+Template.database = database
+Template.config = config
 Template.helppopup = staticmethod(helppopup)
 Template.err = None
 
@@ -678,7 +678,7 @@ class App:
 
     def __iter__(self):
         start_time = time.time()
-        sipb_xen_database.clear_cache()
+        database.clear_cache()
         sys.stderr = StringIO()
         fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ)
         operation = self.environ.get('PATH_INFO', '')