Mercurial Repository: p/roundup/code: roundup/cgi/client.py comparison

comparison roundup/cgi/client.py @ 2940:00f609d53a8c

tweaks to last patch

author	Richard Jones <richard@users.sourceforge.net>
date	Sun, 21 Nov 2004 21:55:03 +0000
parents	463902a0fbbb
children	a50e4f7c9276

comparison

equal deleted inserted replaced

-:463902a0fbbb
+:00f609d53a8c
-# $Id: client.py,v 1.204 2004-11-21 13:27:03 a1s Exp $
+# $Id: client.py,v 1.205 2004-11-21 21:55:03 richard Exp $
 """WWW request handler (also used in the stand-alone server).
 """
 __docformat__ = 'restructuredtext'
 # make sure we're identified (even anonymously)
 self.determine_user()
 # figure out the context and desired content template
-# do this first so we don't authenticate for static files
-# Note: this method opens the database as "admin" in order to
-# perform context checks
 self.determine_context()
 # possibly handle a form submit action (may change self.classname
 # and self.template, and may also append error/ok_messages)
 html = self.handle_action()
 self.user = user
 # reopen the database as the correct user
 self.opendb(self.user)
+def opendb(self, username):
+''' Open the database and set the current user.
+Opens a database once. On subsequent calls only the user is set on
+the database object the instance.optimize is set. If we are in
+"Development Mode" (cf. roundup_server) then the database is always
+re-opened.
+'''
+# don't do anything if the db is open and the user has not changed
+if hasattr(self, 'db') and self.db.isCurrentUser(username):
+return
+# open the database or only set the user
+if not hasattr(self, 'db'):
+self.db = self.instance.open(username)
+else:
+if self.instance.optimize:
+self.db.setCurrentUser(username)
+else:
+self.db.close()
+self.db = self.instance.open(username)
 def determine_context(self, dre=re.compile(r'([^\d]+)0*(\d+)')):
 """Determine the context of this page from the URL:
 The URL path after the instance identifier is examined. The path
 is generally only one entry long.
 self.classname = path[0]
 if len(path) > 1:
 # send the file identified by the designator in path[0]
 raise SendFile, path[0]
-# we need the db for further context stuff - open it as admin
-self.opendb('admin')
 # see if we got a designator
 m = dre.match(self.classname)
 if m:
 self.classname = m.group(1)
 self.nodeid = m.group(2)
 m = dre.match(str(designator))
 if not m:
 raise NotFound, str(designator)
 classname, nodeid = m.group(1), m.group(2)
-self.opendb('admin')
 klass = self.db.getclass(classname)
 # make sure we have the appropriate properties
 props = klass.getprops()
 if not props.has_key('type'):
 user, but that user is mandatory now.
 '''
 self.userid = self.db.user.lookup('anonymous')
 self.user = 'anonymous'
-def opendb(self, username):
-''' Open the database and set the current user.
-Opens a database once. On subsequent calls only the user is set on
-the database object the instance.optimize is set. If we are in
-"Development Mode" (cf. roundup_server) then the database is always
-re-opened.
-'''
-# don't do anything if the db is open and the user has not changed
-if hasattr(self, 'db') and self.db.isCurrentUser(username):
-return
-# open the database or only set the user
-if not hasattr(self, 'db'):
-self.db = self.instance.open(username)
-else:
-if self.instance.optimize:
-self.db.setCurrentUser(username)
-else:
-self.db.close()
-self.db = self.instance.open(username)
 def standard_message(self, to, subject, body, author=None):
 '''Send a standard email message from Roundup.
 "to"      - recipients list
 "subject" - Subject

Mercurial > p > roundup > code

comparison roundup/cgi/client.py @ 2940:00f609d53a8c