# HG changeset patch # User casties # Date 1382982144 -3600 # Node ID 95e0087b9e198ce0538512f4dd277778e5b1ca92 # Parent 0babf6e0a4543daa36b8927fc1dd77fca0737317 removed some comparisons that ignore person-id case. diff -r 0babf6e0a454 -r 95e0087b9e19 MPIWGProjects.py --- a/MPIWGProjects.py Wed Oct 16 15:44:16 2013 +0200 +++ b/MPIWGProjects.py Mon Oct 28 18:42:24 2013 +0100 @@ -1933,7 +1933,7 @@ """ projects = [] # search project numbers - res = self.executeZSQL("select * from projects_members where lower(member_key) = %s", [utf8ify(key).lower()]) + res = self.executeZSQL("select * from projects_members where member_key = %s", [key]) # find projects in folder for r in res: p = self.get(r.project_id, None) @@ -1955,7 +1955,7 @@ """ members = [] sf = self.en.getStaffFolder() - res = self.executeZSQL('select distinct lower(member_key) as "member_key" from projects_members') + res = self.executeZSQL('select distinct member_key from projects_members') if onlyActive: for r in res: m = sf.getMember(key=r.member_key) diff -r 0babf6e0a454 -r 95e0087b9e19 MPIWGRoot.py --- a/MPIWGRoot.py Wed Oct 16 15:44:16 2013 +0200 +++ b/MPIWGRoot.py Mon Oct 28 18:42:24 2013 +0100 @@ -429,6 +429,7 @@ for key in resultSetTmp.keys(): # TODO: properly fix MPIWG: id problem if key.startswith('MPIWG:'): + logging.error("Invalid person key %s!"%key) # strip MPIWG: from key newkey = key.replace('MPIWG:','') # replace key in data diff -r 0babf6e0a454 -r 95e0087b9e19 MPIWGStaff.py --- a/MPIWGStaff.py Wed Oct 16 15:44:16 2013 +0200 +++ b/MPIWGStaff.py Mon Oct 28 18:42:24 2013 +0100 @@ -93,8 +93,7 @@ member = MPIWGStaffMember(self, dbresult=content[0]) elif key is not None: - # TODO: sometimes key is lowercased (e.g. responsibleScientistsList), we should fix the data - content = self.executeZSQL("select * from personal_www where lower(key) = %s", [key.lower()]) + content = self.executeZSQL("select * from personal_www where key = %s", [key]) if len(content) > 0: member = MPIWGStaffMember(self, dbresult=content[0]) @@ -103,7 +102,7 @@ def isActiveMember(self, key): """returns if member key is active""" - res = self.executeZSQL("select * from personal_www where lower(key) = %s and publish_the_data = 'yes'", [key.lower()]) + res = self.executeZSQL("select * from personal_www where key = %s and publish_the_data = 'yes'", [key]) return len(res) > 0