[jToolkit-cvs] jToolkit/web session.py,1.4,1.5

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20176

Modified Files:
	session.py 
Log Message:
updated to make user checking simpler, sql queries more cacheable



Index: session.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/web/session.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** session.py	14 Oct 2003 15:48:09 -0000	1.4
--- session.py	9 Feb 2004 12:22:35 -0000	1.5
***************
*** 342,355 ****
      else:
        username = username.lower()
!     sql = "select passwdhash from users where %s(username)='%s'" % (self.db.dblowerfn(), username)
!     try:
!       q = self.db.query(sql)
!     except IndexError:
!       # couldn't find username
!       raise
!     row = q.fetchone()
!     if row is None:
        raise IndexError, self.localize("user does not exist (%r)") % username
!     return row[0]
  
    def userexists(self):
--- 342,349 ----
      else:
        username = username.lower()
!     if not self.userexists(username):
        raise IndexError, self.localize("user does not exist (%r)") % username
!     sql = "select passwdhash from users where %s(username)='%s'" % (self.db.dblowerfn(), username)
!     return self.db.singlevalue(sql)
  
    def userexists(self):
***************
*** 357,362 ****
      sql = "select count(*) from users where %s(username)='%s'" % \
        (self.db.dblowerfn(), self.username.lower())
!     q = self.db.query(sql)
!     count = int(q.fetchone()[0])
      return count > 0
    
--- 351,355 ----
      sql = "select count(*) from users where %s(username)='%s'" % \
        (self.db.dblowerfn(), self.username.lower())
!     count = self.db.singlevalue(sql)
      return count > 0