Transparently convert UINs into NetIDs, for people who can't follow instructions...

diff --git a/ldapsearcher.py b/ldapsearcher.py
index 5a2bb91b54f133d78ef203c527596e1b176e2d9b..9715a6b20be7c9d633f7d84cb5af04c185885a6b 100644 (file)
--- a/ldapsearcher.py
+++ b/ldapsearcher.py
@@ -12,8 +12,13 @@ class LDAPSearcher():
        def lookup(self,username=""):
                base = ""
                scope = ldap.SCOPE_SUBTREE
-               filter = "tamuEduPersonNetID=" + username
-               retrieve_attributes = ["sn", "givenName", "mail", "major", "classification"]
+               filter = ""
+               try:
+                       uin = int(username)
+                       filter = "tamuEduPersonUIN=" + username
+               except:
+                       filter = "tamuEduPersonNetID=" + username
+               retrieve_attributes = ["tamuEduPersonNetID", "sn", "givenName", "mail", "major", "classification"]
                count = 0
                result_set = []
                all = 0

diff --git a/pagenewuserdata.py b/pagenewuserdata.py
index b2c7e5decacade8ac3f04e6338c96be9bd7313b1..066a3a8517a3fa23920f04885e3e87e74df5cd8a 100644 (file)
--- a/pagenewuserdata.py
+++ b/pagenewuserdata.py
@@ -99,6 +99,8 @@ class PageNewUserData(QWizardPage):
                                self.email.setText(value)
                        elif(key == "major"):
                                self.major.setText(value)
+                       elif(key == "tamuEduPersonNetID"):
+                               self.setField("netid",QVariant(QString(value)))
 
 
 if __name__ == "__main__":